Commit: 97057678e3cb756e87271e0b0849ee17a172a712 - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Revision: 97057678e3cb756e87271e0b0849ee17a172a712 (tree)
• Time: 2012-04-26 07:55:00
• Author: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

Interim work-around for MinGW-Bug #3520864.

Change Summary

• modified: ChangeLog
• modified: src/pkgdeps.cpp
• modified: src/pkgexec.cpp

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	Interim work-around for MinGW-Bug #3520864.
+
+	* src/pkgdeps.cpp (pkgXmlDocument::ResolveDependencies):
+	[DEBUG_TRACE_DEPENDENCIES]: Add request flags to messages reporting
+	the scheduling of installation activities.
+
+	* src/pkgexec.cpp (pkgXmlDocument::Schedule): Add temporary diagnostic
+	hooks to confirm request flags; bracket them with #if 0 ... #endif.
+	[ACTION_PRIMARY && pre-scheduled request]: Don't trash request flags
+	when updating the pre-existing action item data.
+
 2012-04-23  Keith Marshall  <[e-mail]>
 
 	Fix MinGW-Bug #3520488

--- a/src/pkgdeps.cpp
+++ b/src/pkgdeps.cpp
@@ -484,8 +484,9 @@ pkgXmlDocument::ResolveDependencies( pkgXmlNode* package, pkgActionItem* rank )
 	   * we are performing a removal).
 	   */
 	  DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
-	      dmh_printf( "%*s%s: schedule installation\n", indent + 2, "",
-		  selected->GetPropVal( tarname_key, value_unknown )
+	      dmh_printf( "%*s%s: schedule installation (flags=0x%08x)\n",
+		  indent + 2, "", selected->GetPropVal( tarname_key, value_unknown ),
+		  promote( request, ACTION_INSTALL )
 		)
 	    );
 	  rank = Schedule( promote( request, ACTION_INSTALL ), wanted, rank );

--- a/src/pkgexec.cpp
+++ b/src/pkgexec.cpp
@@ -376,7 +376,13 @@ pkgActionItem* pkgXmlDocument::Schedule
      * we update the already scheduled request to reflect this...
      */
     if( (action & ACTION_PRIMARY) == ACTION_PRIMARY )
-      prior->SetPrimary( rank = ref->Schedule( action & ACTION_MASK, item ) );
+      prior->SetPrimary( rank = ref->Schedule( action /* & ACTION_MASK */, item ) );
+#   if 0
+      dmh_printf( "Schedule(0x%08x):%s(prior)\n",
+	  prior->HasAttribute((unsigned long)(-1)),
+	  prior->Selection()->ArchiveName()
+	);
+#   endif
     return prior;
   }
   /* ...otherwise, when this request produces a valid package reference,
@@ -385,6 +391,12 @@ pkgActionItem* pkgXmlDocument::Schedule
   else if( ((ref = ref->Schedule( action, item )) != NULL)
   &&   ((ref->Selection() != NULL) || (ref->Selection( to_remove ) != NULL)) )
   {
+#   if 0
+      dmh_printf( "Schedule(0x%08x):%s(new)\n",
+	  ref->HasAttribute((unsigned long)(-1)),
+	  ref->Selection()->ArchiveName()
+	);
+#   endif
     /* ...and, when successfully raised, add it to the task list...
      */
     if( rank )