Commit: 6fdbd5bcaaf3f5c5c6ac0fdeac2a9635f00b0a4f - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Revision: 6fdbd5bcaaf3f5c5c6ac0fdeac2a9635f00b0a4f (tree)
• Zeit: 2011-06-13 04:38:11
• Autor: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

Don't require -vv to report progress of update operation.

Ändern Zusammenfassung

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

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	Don't require -vv to report progress of update operation.
+
+	* src/pkgbind.cpp (pkgRepository::GetPackageList): Eliminate all
+	basename() calls; `dname' already tells us what it should return.
+	[update]: Report progress, irrespective of verbosity setting.
+
 2011-06-11  Keith Marshall  <[e-mail]>
 
 	Fix MinGW-Bug #3313806.

--- a/src/pkgbind.cpp
+++ b/src/pkgbind.cpp
@@ -26,7 +26,6 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
-#include <libgen.h>
 #include <string.h>
 #include <unistd.h>
 
@@ -78,11 +77,13 @@ void pkgRepository::GetPackageList( const char *dname )
       /* Check for a locally cached copy of the "package-list" file...
        */
       if( force_update || (access( dfile, F_OK ) != 0) )
-	/*
-	 * When performing an "update", or if no local copy is available...
+      {
+	/* When performing an "update", or if no local copy is available...
 	 * Force a "sync", to fetch a copy from the public host.
 	 */
+	dmh_printf( "Update catalogue: %s.xml\n", dname );
 	owner->SyncRepository( dname, repository );
+      }
 
       /* We SHOULD now have a locally cached copy of the package-list;
        * attempt to merge it into the active profile database...
@@ -93,11 +94,8 @@ void pkgRepository::GetPackageList( const char *dname )
 	/* We successfully loaded the XML catalogue; refer to its
 	 * root element...
 	 */
-	char catname[ 1 + strlen( merge.Value() ) ];
 	if( pkgOptions()->Test( OPTION_VERBOSE ) > 1 )
-	  dmh_printf(
-	      "Load catalogue: %s\n", basename( strcpy( catname, merge.Value() ))
-	    );
+	  dmh_printf( "Load catalogue: %s.xml\n", dname );
 	pkgXmlNode *catalogue, *pkglist;
 	if( (catalogue = merge.GetRoot()) != NULL )
 	{
@@ -127,10 +125,7 @@ void pkgRepository::GetPackageList( const char *dname )
       { /* The specified catalogue could not be successfully loaded;
 	 * emit a warning diagnostic message, and otherwise ignore it.
 	 */
-	char catname[ 1 + strlen( dfile ) ];
-	dmh_notify( DMH_WARNING,
-	    "Load catalogue: FAILED: %s\n", basename( strcpy( catname, dfile ))
-	  );
+	dmh_notify( DMH_WARNING, "Load catalogue: FAILED: %s.xml\n", dname );
       }
 
       /* However we handled it, the XML file's path name in "dfile" was