Commit: 9894a37a511ab8e3d6ec488a2fc79d7aefd184ff - mingw-get (git)

The MinGW.OSDN Installation Manager Tool

Commit MetaInfo

• Revision: 9894a37a511ab8e3d6ec488a2fc79d7aefd184ff (tree)
• Zeit: 2012-12-19 23:16:43
• Autor: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

Make the "Apply Changes" dialogue "failure-aware".

Ändern Zusammenfassung

• modified: ChangeLog
• modified: src/guixmld.cpp
• modified: src/pkgdata.cpp
• modified: src/pkgexec.cpp
• modified: src/pkginst.cpp
• modified: src/pkgtask.h
• modified: src/pkgunst.cpp

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
 2012-12-19  Keith Marshall  <[e-mail]>
 
+	Make the "Apply Changes" dialogue "failure-aware".
+
+	* src/pkgtask.h (ACTION_APPLY_FAILED): Redefine, in terms of...
+	(ACTION_INSTALL_FAILED, ACTION_REMOVE_FAILED): New manifest defines.
+	(ACTION_UNSUCCESSFUL): New manifest constant; define it.
+
+	* src/pkgdata.cpp (pkgActionItem::EnumeratePendingActions):
+	[ACTION_UNSUCCESSFUL]: Make it a special case for enumeration.
+
+	* src/guixmld.cpp (pkgApplyChanges): Enumerate...
+	[ACTION_UNSUCCESSFUL > 0]: ...all such cases; when true...
+	[IDD_AUTO_CLOSE_OPTION]: ...this; select alternative close-out
+	messages, as appropriate.
+	(pkgActionItem::Assert): Factor out; relocate to...
+	* src/pkgexec.cpp (pkgActionItem::Assert): ...here; this moves its
+	object code into the mingw-get DLL.
+
+	* src/pkgunst.cpp (pkgRemove) [ACTION_REMOVE_FAILED]:
+	* src/pkginst.cpp (pkgInstall) [ACTION_INSTALL_FAILED]:
+	Assert as appropriate.
+
[phone]  Keith Marshall  <[e-mail]>
+
 	Improve progress reporting in "Apply Changes" dialogue.
 
 	* src/pkgstat.h: New header file; it declares...

--- a/src/guixmld.cpp
+++ b/src/guixmld.cpp
@@ -344,15 +344,18 @@ static void pkgApplyChanges( void *window )
   app->ExecuteScheduledActions();
   dmh_setpty( NULL );
 
+  /* Check for successful application of all scheduled changes.
+   */
+  int error_count = app->EnumerateActions( ACTION_UNSUCCESSFUL );
+
   /* During processing, the user may have selected the option for
    * automatic dismissal of the dialogue box on completion...
-   *
-   * FIXME: We need to adapt this, so that auto-close is ignored
-   * when any scheduled action fails to complete successfully.
    */
-  if( IsDlgButtonChecked( (HWND)(window), IDD_AUTO_CLOSE_OPTION ) )
+  if(  (error_count == 0)
+  &&  IsDlgButtonChecked( (HWND)(window), IDD_AUTO_CLOSE_OPTION )  )
     /*
-     * ...in which case, we dismiss it without further ado...
+     * ...in which case, and provided all changes were applied
+     * successfully, we dismiss it without further ado...
      */
     SendMessage( (HWND)(window), WM_COMMAND, (WPARAM)(IDOK), 0 );
 
@@ -365,8 +368,11 @@ static void pkgApplyChanges( void *window )
 
     /* ...and notify the user that it must be clicked to continue.
      */
-    stat.Report( "All changes have been successfully applied;"
-	" you may now close this dialogue."
+    stat.Report( (error_count == 0)
+	? "All changes were applied successfully;"
+	  " you may now close this dialogue."
+	: "Not all changes were applied successfully;"
+	  " please refer to details below."
       );
   }
 }
@@ -477,36 +483,6 @@ pkgActionItem
   return residual;
 }
 
-void pkgActionItem::Assert
-( unsigned long set, unsigned long mask, pkgActionItem *schedule )
-{
-  /* A method to manipulate the control, error trapping, and state
-   * flags for all items in the specified schedule of actions.
-   *
-   * Starting at the specified item, or the invoking class object
-   * item if no starting point is specified...
-   */
-  if( (schedule != NULL) || ((schedule = this) != NULL) )
-  {
-    /* ...and provided this starting point is not NULL, walk back
-     * to the first item in the associated task schedule...
-     */
-    while( schedule->prev != NULL ) schedule = schedule->prev;
-    while( schedule != NULL )
-    {
-      /* ...then, processing each scheduled task item in sequence,
-       * update the flags according to the specified mask and new
-       * bits to be set...
-       */
-      schedule->flags = (schedule->flags & mask) | set;
-      /*
-       * ...before moving on to the next item in the sequence.
-       */
-      schedule = schedule->next;
-    }
-  }
-}
-
 static int pkgActionCount( HWND dlg, int id, const char *fmt, int classified )
 {
   /* Helper function to itemise the currently scheduled actions

--- a/src/pkgdata.cpp
+++ b/src/pkgdata.cpp
@@ -1284,11 +1284,16 @@ unsigned long pkgActionItem::EnumeratePendingActions( int classified )
 	    ++count;
 	  }
 	}
-	else if( classified == 0 )
+	else if( (classified == 0)
 	  /*
-	   * ...otherwise, when we aren't interested in any
-	   * particular class of action, just count all those
-	   * which are found, regardless of classification.
+	   * ...otherwise, when we aren't interested in any particular
+	   * class of action regardless of classification...
+	   */
+	|| ((classified == ACTION_UNSUCCESSFUL) && ((flags & classified) != 0)) )
+	  /*
+	   * ...or when we are checking for unsuccessful actions, we
+	   * count all those which are found, either unclassified, or
+	   * marked as unsuccessful, respectively.
 	   */
 	  ++count;
       }

--- a/src/pkgexec.cpp
+++ b/src/pkgexec.cpp
@@ -306,6 +306,36 @@ pkgActionItem::Schedule( unsigned long action, pkgActionItem& item )
   return rtn;
 }
 
+void pkgActionItem::Assert
+( unsigned long set, unsigned long mask, pkgActionItem *schedule )
+{
+  /* A method to manipulate the control, error trapping, and state
+   * flags for all items in the specified schedule of actions.
+   *
+   * Starting at the specified item, or the invoking class object
+   * item if no starting point is specified...
+   */
+  if( (schedule != NULL) || ((schedule = this) != NULL) )
+  {
+    /* ...and provided this starting point is not NULL, walk back
+     * to the first item in the associated task schedule...
+     */
+    while( schedule->prev != NULL ) schedule = schedule->prev;
+    while( schedule != NULL )
+    {
+      /* ...then, processing each scheduled task item in sequence,
+       * update the flags according to the specified mask and new
+       * bits to be set...
+       */
+      schedule->flags = (schedule->flags & mask) | set;
+      /*
+       * ...before moving on to the next item in the sequence.
+       */
+      schedule = schedule->next;
+    }
+  }
+}
+
 pkgActionItem*
 pkgActionItem::GetReference( pkgActionItem& item )
 {

--- a/src/pkginst.cpp
+++ b/src/pkginst.cpp
@@ -4,7 +4,7 @@
  * $Id$
  *
  * Written by Keith Marshall <[e-mail]>
- * Copyright (C) 2010, 2011, 2012, MinGW Project
+ * Copyright (C) 2010, 2011, 2012, MinGW.org Project
  *
  *
  * Implementation of the primary package installation and package
@@ -378,9 +378,12 @@ EXTERN_C void pkgRegister
 
 EXTERN_C void pkgInstall( pkgActionItem *current )
 {
-  /* Common handler for all package installation tasks...
+  /* Common handler for all package installation tasks; note that we
+   * initially assert failure, and will revert this assertion in the
+   * event of subsequent successful installation...
    */
   pkgXmlNode *pkg;
+  current->Assert( ACTION_INSTALL_FAILED );
   if( (pkg = current->Selection()) != NULL )
   {
     /* The current action item has a valid package association...
@@ -451,6 +454,11 @@ EXTERN_C void pkgInstall( pkgActionItem *current )
 	 * we may now run its post-install script, (if any).
 	 */
 	pkg->InvokeScript( "post-install" );
+
+	/* When we get to here, the package should have been installed
+	 * successfully; revert our original assertion of failure.
+	 */
+	current->Assert( 0UL, ~ACTION_INSTALL_FAILED );
       }
       else
 	/* There is a prior installation of the selected package, which

--- a/src/pkgtask.h
+++ b/src/pkgtask.h
@@ -86,7 +86,11 @@ enum
  * could not be completed successfully.
  */
 #define ACTION_DOWNLOAD_FAILED	(ACTION_PRIMARY << 5)
-#define ACTION_APPLY_FAILED	(ACTION_PRIMARY << 6)
+#define ACTION_INSTALL_FAILED	(ACTION_PRIMARY << 6)
+#define ACTION_REMOVE_FAILED	(ACTION_PRIMARY << 7)
+
+#define ACTION_APPLY_FAILED	(ACTION_INSTALL_FAILED | ACTION_REMOVE_FAILED)
+#define ACTION_UNSUCCESSFUL	(ACTION_DOWNLOAD_FAILED | ACTION_APPLY_FAILED)
 
 #ifndef EXTERN_C
 /* A convenience macro, to facilitate declaration of functions

--- a/src/pkgunst.cpp
+++ b/src/pkgunst.cpp
@@ -301,9 +301,11 @@ int pkg_unlink( const char *sysroot, const char *pathname )
 
 EXTERN_C void pkgRemove( pkgActionItem *current )
 {
-  /* Common handler for all package removal tasks...
+  /* Common handler for all package removal tasks; note that we
+   * initially assert failure, pending reversion on success...
    */
   pkgXmlNode *pkg;
+  current->Assert( ACTION_REMOVE_FAILED );
   if( ((pkg = current->Selection( to_remove )) != NULL)
   &&  (current->HasAttribute( ACTION_DOWNLOAD_OK ) == ACTION_REMOVE_OK)  )
   {
@@ -399,6 +401,12 @@ EXTERN_C void pkgRemove( pkgActionItem *current )
 	      "%s: unreferenced in %s\n", sysname, id_lookup( manifest, value_unknown )
 	    );
 	}
+	else
+	  /* Removal should be successful: revert our original
+	   * assertion of failure...
+	   */
+	  current->Assert( 0UL, ~ACTION_REMOVE_FAILED );
+
 	/* Now, we've validated the manifest, and confirmed that it
 	 * correctly records its association with the current sysroot,
 	 * (or we've reported the inconsistency; we may proceed with