From: Keith M. <no...@so...> - 2013-09-19 20:52:27
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Repository: mingw-get". The branch, master has been updated via 0d4799a065f3028893f6a92bb353928ae4def0d6 (commit) via bac34b1b9c213a045b57cb71b2625414df5661df (commit) from 310cc04ca32af5d5a0a68d5faf9e7d1fb8ae766e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://sf.net/p/mingw/mingw-get/ci/0d4799a065f3028893f6a92bb353928ae4def0d6/ commit 0d4799a065f3028893f6a92bb353928ae4def0d6 Author: Keith Marshall <kei...@us...> Date: Thu Sep 19 21:15:27 2013 +0100 Correct LUA_PATH assignment for GUI; (cf. MinGW-Bug #2052) diff --git a/ChangeLog b/ChangeLog index 789513a..d4ece1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2013-09-19 Keith Marshall <kei...@us...> + Correct LUA_PATH assignment for GUI; (cf. MinGW-Bug #2052) + + * src/pkgexec.cpp (LUA_LIBEXEC_PATH): New manifest string; define it. + (init_lua_path) <LUA_PATH>: Use it; add guimain.exe app directory. + +2013-09-19 Keith Marshall <kei...@us...> + Handle meta-package removal correctly; (cf. MinGW-Bug #2051) * src/pkgunst.cpp (pkgRemove) [archive == none]: Ensure the pending diff --git a/src/pkgexec.cpp b/src/pkgexec.cpp index 116cc83..b77aff9 100644 --- a/src/pkgexec.cpp +++ b/src/pkgexec.cpp @@ -4,7 +4,7 @@ * $Id$ * * Written by Keith Marshall <kei...@us...> - * Copyright (C) 2009, 2010, 2011, 2012, 2013, MinGW.org Project + * Copyright (C) 2009-2013, MinGW.org Project * * * Implementation of package management task scheduler and executive. @@ -752,12 +752,13 @@ static const char *action_key = "action"; static const char *normal_key = "normal"; static inline __attribute__((__always_inline__)) bool init_lua_path() +# define LUA_LIBEXEC_PATH "\\libexec\\mingw-get\\?.lua" { /* A one time initialisation hook, to ensure that the built-in Lua script * interpreter will load scripts from the libexec directory associated with * the running mingw-get.exe instance. */ - putenv( "LUA_PATH=!\\libexec\\mingw-get\\?.lua;!\\..\\libexec\\mingw-get\\?.lua" ); + putenv( "LUA_PATH=!\\?.lua;!"LUA_LIBEXEC_PATH";!\\.."LUA_LIBEXEC_PATH ); return true; } https://sf.net/p/mingw/mingw-get/ci/bac34b1b9c213a045b57cb71b2625414df5661df/ commit bac34b1b9c213a045b57cb71b2625414df5661df Author: Keith Marshall <kei...@us...> Date: Thu Sep 19 15:37:17 2013 +0100 Handle meta-package removal correctly; (cf. MinGW-Bug #2051) diff --git a/ChangeLog b/ChangeLog index ba4fb1a..789513a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2013-09-19 Keith Marshall <kei...@us...> + + Handle meta-package removal correctly; (cf. MinGW-Bug #2051) + + * src/pkgunst.cpp (pkgRemove) [archive == none]: Ensure the pending + action flag is cleared; previously this was done during manifest clean + up, and since a meta-package has no manifest, it was overlooked. + 2013-09-10 Keith Marshall <kei...@us...> mingw-get-0.6.1-mingw32-beta-20130910-1 released. diff --git a/src/pkgunst.cpp b/src/pkgunst.cpp index 052fefb..e40c829 100644 --- a/src/pkgunst.cpp +++ b/src/pkgunst.cpp @@ -4,7 +4,7 @@ * $Id$ * * Written by Keith Marshall <kei...@us...> - * Copyright (C) 2011, 2012, MinGW.org Project + * Copyright (C) 2011-2013, MinGW.org Project * * * Implementation of the primary package removal methods. @@ -330,9 +330,14 @@ EXTERN_C void pkgRemove( pkgActionItem *current ) * have no associated archive file, no installed footprint on disk, * and no associated content manifest to process; thus... */ - if( ! match_if_explicit( pkg->ArchiveName(), value_none ) ) + if( match_if_explicit( pkg->ArchiveName(), value_none ) ) { - /* ...only in the case of packages identified as "real", (which + /* ...we may simply assert the removal action as successful... + */ + current->Assert( 0UL, ~ACTION_REMOVE_FAILED ); + } + else + { /* ...but, in the case of packages identified as "real", (which * we expect to be in a substantial majority), do we need to refer * to any installation manifest, to identify actual disk files to * be removed. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 15 +++++++++++++++ src/pkgexec.cpp | 5 +++-- src/pkgunst.cpp | 11 ++++++++--- 3 files changed, 26 insertions(+), 5 deletions(-) hooks/post-receive -- Repository: mingw-get |