Fix MinGW-Bug #3313806.

diff --git a/ChangeLog b/ChangeLog
index c99efc1..f497679 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
+2011-06-11  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       Fix MinGW-Bug #3313806.
+
+       * src/pkginfo/pkginfo.l (CMS_KEYWORDS): Do not match them within the
+       PACKAGE_NAME field; this avoids misinterpretation as a release status
+       qualifier when intended as part of the package name, as in msys-cvs.
+
 2011-06-07  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
-       Provisional correction for MinGW-bug #3309438.
+       Provisional correction for MinGW-Bug #3309438.
 
        * src/debug.h [DEBUGLEVEL == 0]: Provide defaults for...
        (DEBUG_ENABLED, DEBUG_REQUEST): ...these macros.

diff --git a/src/pkginfo/pkginfo.l b/src/pkginfo/pkginfo.l
index 2520d6d..98e611f 100644 (file)
--- a/src/pkginfo/pkginfo.l
+++ b/src/pkginfo/pkginfo.l
@@ -153,7 +153,7 @@ CMS_KEYWORDS (bzr|cms|cvs|darcs|git|hg|mono|scm|svn|vcs)
      * revert to INITIAL state, to continue the <archive-name> scan.
      */
     BEGIN INITIAL; yyless( 0 );
-    if( index < PACKAGE_RELEASE_STATUS )
+    if( (PACKAGE_NAME < index) && (index < PACKAGE_RELEASE_STATUS) )
     {
       /* and, when the <status> descriptor is appropriately placed,
        * set up `signature' storage to capture it, adjusting phase to