Commit: cdc3a9f611a084122f61c57b5ae66b885c4a6a4a - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Révision: cdc3a9f611a084122f61c57b5ae66b885c4a6a4a (tree)
• l'heure: 2011-06-14 04:00:14
• Auteur: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Message de Log

Implement --reinstall option.

Change Summary

• modified: ChangeLog
• modified: src/clistub.c
• modified: src/pkgexec.cpp
• modified: src/pkgopts.h

Modification

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	Implement --reinstall option.
+
+	* src/pkgopts.h (OPTION_REINSTALL): New macro; define it.
+	(OPTION_GENERIC, OPTION_SHIFT_MASK): Likewise.
+	(OPTION_EXTRA_FLAGS): New field; declare it.
+
+	* src/clistub.c (options): Add "reinstall".
+	(OPTION_GENERIC): Use it where appropriate; within its scope...
+	(OPTION_STORAGE_CLASS): Improve descriptive comments; add handling for
+	default case of flag type options requiring an alignment shift.
+
+	* src/pkgexec.cpp: Remove previous "always reinstall" kludge.
+	(pkgOptionSelected, PKG_OPTION_REINSTALL): Remove obsolete macros.
+	(pkgActionItem::Execute): Check for "upgrade" request on any package
+	which is already up to date; report this state, otherwise...
+	[OPTION_REINSTALL || ACTION_UPGRADE]: Mark package as "removed", to
+	avoid bail-out on "package already installed", when calling...
+	(pkgInstall): ...this.
+
 2011-06-12  Keith Marshall  <[e-mail]>
 
 	Don't require -vv to report progress of update operation.

--- a/src/clistub.c
+++ b/src/clistub.c
@@ -356,17 +356,19 @@ int main( int argc, char **argv )
     struct option options[] =
     {
       /* Option Name      Argument Category    Store To   Return Value
-       * --------------   ------------------   --------   --------------
+       * --------------   ------------------   --------   ----------------
        */
-      { "version",        no_argument,         NULL,      'V'            },
-      { "help",           no_argument,         NULL,      'h'            },
-      { "verbose",        optional_argument,   NULL,      OPTION_VERBOSE },
+      { "version",        no_argument,         NULL,      'V'              },
+      { "help",           no_argument,         NULL,      'h'              },
+      { "verbose",        optional_argument,   NULL,      OPTION_VERBOSE   },
+
+      { "reinstall",      no_argument,         &optref,   OPTION_REINSTALL },
 
 #     if DEBUG_ENABLED( DEBUG_TRACE_DYNAMIC )
 	/* The "--trace" option is supported only when dynamic tracing
 	 * debugging support has been compiled in.
 	 */
-      { "trace",          required_argument,   &optref,   OPTION_TRACE   },
+      { "trace",          required_argument,   &optref,   OPTION_TRACE     },
 #     endif
 
       /* This list must be terminated by a null definition...
@@ -424,20 +426,52 @@ int main( int argc, char **argv )
 	    ++parsed_options.flags[OPTION_FLAGS].numeric;
 	  break;
 
-	case 0:
+	case OPTION_GENERIC:
 	  switch( optref & OPTION_STORAGE_CLASS )
 	  {
+	    /* This represents a generic option specification,
+	     * allowing for storage of a option argument of the
+	     * specified class into a specified option slot...
+	     */
+	    unsigned shift;
+
 	    case OPTION_STORE_STRING:
+	      /* This is a simple store of a option argument
+	       * which represents a character string.
+	       */
 	      parsed_options.flags[optref & 0xfff].string = optarg;
 	      break;
 
 	    case OPTION_STORE_NUMBER:
+	      /* This is also a simple store of the argument value,
+	       * in this case interpreted as a number.
+	       */
 	      parsed_options.flags[optref & 0xfff].numeric = xatoi( optarg );
 	      break;
 
 	    case OPTION_MERGE_NUMBER:
+	      /* In this case, we combine the value of the argument,
+	       * again interpreted as a number, with the original value
+	       * stored in the option slot, forming the bitwise logical
+	       * .OR. of the pair of values.
+	       */
 	      parsed_options.flags[optref & 0xfff].numeric |= xatoi( optarg );
 	      break;
+
+	    default:
+	      /* This is a mask and store operation for a specified
+	       * bit-field within the first pair of flags slots; in
+	       * this case, the optref value itself specifies a 12-bit
+	       * value, a 12-bit combining mask, and an alignment shift
+	       * count between 0 and 52, in 4-bit increments.
+	       */
+	      if( (shift = (optref & OPTION_SHIFT_MASK) >> 22) < 53 )
+	      {
+		uint64_t value = optref & 0xfff;
+		uint64_t mask = (optref & 0xfff000) >> 12;
+		*(uint64_t *)(parsed_options.flags) &= ~(mask << shift);
+		*(uint64_t *)(parsed_options.flags) |= value << shift;
+	      }
 	  }
 	  break;
 

--- a/src/pkgexec.cpp
+++ b/src/pkgexec.cpp
@@ -31,16 +31,9 @@
 #include "pkgkeys.h"
 #include "pkginfo.h"
 #include "pkgtask.h"
+#include "pkgopts.h"
 #include "pkgproc.h"
 
-/* FIXME: temporarily establish "install" behaviour as if the
- * "--reinstall" option is selected; remove this kludge, when we
- * have an effective "uninstall" implementation, and have provided
- * a mechanism for specifying options.
- */
-#define pkgOptionSelected( OPT )  OPT
-#define PKG_OPTION_REINSTALL	  true
-
 EXTERN_C const char *action_name( unsigned long index )
 {
   /* Define the keywords used on the mingw-get command line,
@@ -412,24 +405,46 @@ void pkgActionItem::Execute()
 	   */
 	  init_rites_pending = self_upgrade_rites( tarname );
 
-	if( (current->flags & ACTION_REMOVE) == ACTION_REMOVE )
-	{
-	  /* The selected package has been marked for removal, either explicitly,
-	   * or as an implicit prerequisite for upgrade.
+	/* If we are performing an upgrade...
+	 */
+	if( ((current->flags & ACTION_MASK) == ACTION_UPGRADE)
+	/*
+	 * ...and the latest version of the package is already installed...
+	 */
+	&&  (current->Selection() == current->Selection( to_remove ))
+	/*
+	 * ...and the `--reinstall' option hasn't been specified...
+	 */
+	&&  (pkgOptions()->Test( OPTION_REINSTALL ) == 0)  )
+	  /*
+	   * ...then simply report the up-to-date status...
 	   */
-	  pkgRemove( current );
-	}
+	  dmh_notify( DMH_INFO, "package %s is up to date\n", tarname );
 
-	if( (current->flags & ACTION_INSTALL) == ACTION_INSTALL )
-	{
-	  /* The selected package has been marked for installation, either explicitly,
-	   * or implicitly to complete a package upgrade.
+	else
+	{ /* ...otherwise, proceed to perform remove and install
+	   * operations, as appropriate.
 	   */
-	  pkgXmlNode *tmp = current->Selection( to_remove );
-	  if( pkgOptionSelected( PKG_OPTION_REINSTALL ) )
-	    current->selection[ to_remove ] = NULL;
-	  pkgInstall( current );
-	  current->selection[ to_remove ] = tmp;
+	  if( (current->flags & ACTION_REMOVE) == ACTION_REMOVE )
+	  {
+	    /* The selected package has been marked for removal,
+	     * either explicitly, or as an implicit prerequisite for upgrade.
+	     */
+	    pkgRemove( current );
+	  }
+
+	  if( (current->flags & ACTION_INSTALL) == ACTION_INSTALL )
+	  {
+	    /* The selected package has been marked for installation,
+	     * either explicitly, or implicitly to complete a package upgrade.
+	     */
+	    pkgXmlNode *tmp = current->Selection( to_remove );
+	    if(   pkgOptions()->Test( OPTION_REINSTALL )
+	    ||  ((current->flags & ACTION_MASK) == ACTION_UPGRADE)  )
+	      current->selection[ to_remove ] = NULL;
+	    pkgInstall( current );
+	    current->selection[ to_remove ] = tmp;
+	  }
 	}
       }
       /* Proceed to the next package, if any, with scheduled actions.

--- a/src/pkgopts.h
+++ b/src/pkgopts.h
@@ -28,11 +28,16 @@
  */
 #define PKGOPTS_H  1
 
+#include <stdint.h>		/* required for uint64_t typedef */
+
+#define OPTION_GENERIC  0
+
 enum
 { /* Specification of symbolic names (keys) for each of the individual
    * entries in the options parameter array.
    */
   OPTION_FLAGS,
+  OPTION_EXTRA_FLAGS,
   OPTION_DEBUGLEVEL,
 
   /* This final entry specifies the size of the parameter array which
@@ -60,6 +65,7 @@ struct pkgopts
 
 /* Bit-mapped control tags used by the CLI options parsing code...
  */
+#define OPTION_SHIFT_MASK	(0x0000000f << 24)
 #define OPTION_STORAGE_CLASS	(0x00000007 << 28)
 /*
  * ...to determine how option arguments are to be inserted into the
@@ -78,6 +84,8 @@ struct pkgopts
 #define OPTION_VERBOSE		(0x00000003)
 #define OPTION_VERBOSE_MAX	(0x00000003)
 
+#define OPTION_REINSTALL	(0x00000010)
+
 #if __cplusplus
 /*
  * We provide additional features for use in C++ modules.