Commit: 18469af41a2ad6ce1259fd60501476d8d38ad2dc - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Revision: 18469af41a2ad6ce1259fd60501476d8d38ad2dc (tree)
• Time: 2013-01-09 20:12:03
• Author: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

Include release tags in GUI displayed package versions.

Change Summary

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

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	Include release tags in GUI displayed package versions.
+
+	* src/pkglist.cpp (pkgVersionString) [ReleaseStatus != NULL]:
+	Append ReleaseStatus and ReleaseIndex to generated version string.
+
 2013-01-08  Keith Marshall  <[e-mail]>
 
 	Fix enumeration of pending install actions for scheduled upgrades.

--- a/src/pkglist.cpp
+++ b/src/pkglist.cpp
@@ -209,16 +209,30 @@ static char *pkgVersionString( char *buf, pkgSpecs *pkg )
    * We begin with the concatenation of package version and build ID
    * fields, retrieved from the pkgSpecs representation...
    */
+  const char *pkg_version_tag;
   char *update = version_string_copy( buf, pkg->GetPackageVersion() );
   update = version_string_copy( update, pkg->GetPackageBuild(), '-' );
-  if( pkg->GetSubSystemVersion() != NULL )
+  if( (pkg_version_tag = pkg->GetSubSystemVersion()) != NULL )
   {
-    /* ...then, we append the sub-system ID, if applicable...
+    /* ...then, we append the sub-system ID, if applicable.
      */
     update = version_string_copy( update, pkg->GetSubSystemName(), '-' );
-    update = version_string_copy( update, pkg->GetSubSystemVersion(), '-' );
+    update = version_string_copy( update, pkg_version_tag, '-' );
     update = version_string_copy( update, pkg->GetSubSystemBuild(), '-' );
   }
+  if( (pkg_version_tag = pkg->GetReleaseStatus()) != NULL )
+  {
+    /* When the package name also includes a release classification,
+     * then we also append this to the displayed version number (noting
+     * that an initial '$' is special, and should be suppressed)...
+     */
+    if( *pkg_version_tag == '$' ) ++pkg_version_tag;
+    update = version_string_copy( update, pkg_version_tag, '-' );
+    /*
+     * ...followed by any serialisation index for the release...
+     */
+    update = version_string_copy( update, pkg->GetReleaseIndex(), '-' );
+  }
   /* ...and finally, we return a pointer to the buffer in which
    * we constructed the fully qualified version string.
    */