[csw-devel] SF.net SVN: gar:[8994] csw/mgar/gar/v2/lib/python

[wahwah at users.sourceforge.net]

Revision: 8994
          http://gar.svn.sourceforge.net/gar/?rev=8994&view=rev
Author:   wahwah
Date:     2010-03-06 08:43:57 +0000 (Sat, 06 Mar 2010)

Log Message:
-----------
mGAR v2: checkpkg, allow dots in the PSTAMP

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/checkpkg.py
    csw/mgar/gar/v2/lib/python/package_checks_old.py

Modified: csw/mgar/gar/v2/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg.py	2010-03-06 07:43:18 UTC (rev 8993)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2010-03-06 08:43:57 UTC (rev 8994)
@@ -31,7 +31,7 @@
 DO_NOT_REPORT_MISSING = set([])
 DO_NOT_REPORT_MISSING_RE = [r"SUNW.*", r"\*SUNW.*"]
 DUMP_BIN = "/usr/ccs/bin/dump"
-PSTAMP_RE = r"(?P<username>\w)+@(?P<hostname>\w+)-(?P<timestamp>\d+)"
+PSTAMP_RE = r"(?P<username>\w)+@(?P<hostname>[\w\.]+)-(?P<timestamp>\d+)"
 DESCRIPTION_RE = r"^([\S]+) - (.*)$"
 
 SYSTEM_SYMLINKS = (

Modified: csw/mgar/gar/v2/lib/python/package_checks_old.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_old.py	2010-03-06 07:43:18 UTC (rev 8993)
+++ csw/mgar/gar/v2/lib/python/package_checks_old.py	2010-03-06 08:43:57 UTC (rev 8994)
@@ -131,7 +131,8 @@
   if "PSTAMP" in pkginfo:
     if not re.match(checkpkg.PSTAMP_RE, pkginfo["PSTAMP"]):
       errors.append(checkpkg.CheckpkgTag(
-        pkgname, "pkginfo-pkstamp-in-wrong-format",
+        pkgname, "pkginfo-pstamp-in-wrong-format",
+        pkginfo["PSTAMP"],
         msg=("It should be 'username at hostname-timestamp', "
              "but it's %s." % repr(pkginfo["PSTAMP"]))))
   else:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.