Commit: 0a456b3f28c8c1d5223cac0188e2eb4b199c53b8 - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Revision: 0a456b3f28c8c1d5223cac0188e2eb4b199c53b8 (tree)
• Time: 2013-09-19 23:37:17
• Author: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

Handle meta-package removal correctly; (cf. MinGW-Bug #2051)

Change Summary

• modified: ChangeLog
• modified: src/pkgunst.cpp

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	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  <[e-mail]>
 
 	mingw-get-0.6.1-mingw32-beta-20130910-1 released.

--- a/src/pkgunst.cpp
+++ b/src/pkgunst.cpp
@@ -4,7 +4,7 @@
  * $Id$
  *
  * Written by Keith Marshall <[e-mail]>
- * 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.