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

[wahwah at users.sourceforge.net]

Revision: 14158
          http://gar.svn.sourceforge.net/gar/?rev=14158&view=rev
Author:   wahwah
Date:     2011-04-13 11:11:44 +0000 (Wed, 13 Apr 2011)

Log Message:
-----------
csw-upload-pkg: Display file with wrong vendor tag

It will make the output easier to understand by users.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/file_set_checker.py
    csw/mgar/gar/v2/lib/python/file_set_checker_test.py

Modified: csw/mgar/gar/v2/lib/python/file_set_checker.py
===================================================================
--- csw/mgar/gar/v2/lib/python/file_set_checker.py	2011-04-13 10:25:48 UTC (rev 14157)
+++ csw/mgar/gar/v2/lib/python/file_set_checker.py	2011-04-13 11:11:44 UTC (rev 14158)
@@ -23,8 +23,8 @@
         tags.append(tag.CheckpkgTag(
           None,
           "bad-vendor-tag",
-          "%s expected=%s actual=%s"
-          % (parsed_filename["catalogname"],
+          "filename=%s expected=%s actual=%s"
+          % (filename,
              expected_vendor_tag,
              parsed_filename["vendortag"])))
     return tags

Modified: csw/mgar/gar/v2/lib/python/file_set_checker_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/file_set_checker_test.py	2011-04-13 10:25:48 UTC (rev 14157)
+++ csw/mgar/gar/v2/lib/python/file_set_checker_test.py	2011-04-13 11:11:44 UTC (rev 14158)
@@ -44,8 +44,12 @@
   def testUncommitted(self):
     fc = file_set_checker.FileSetChecker()
     expected = [
-        tag.CheckpkgTag(None, 'bad-vendor-tag', 'nspr_devel expected=CSW actual=UNCOMMITTED'),
-        tag.CheckpkgTag(None, 'bad-vendor-tag', 'nspr_devel expected=CSW actual=UNCOMMITTED'),
+        tag.CheckpkgTag(
+          None, 'bad-vendor-tag',
+          'filename=nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-sparc-UNCOMMITTED.pkg.gz expected=CSW actual=UNCOMMITTED'),
+        tag.CheckpkgTag(
+          None, 'bad-vendor-tag',
+          'filename=nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-i386-UNCOMMITTED.pkg.gz expected=CSW actual=UNCOMMITTED'),
     ]
     files = ['/home/experimental/maciej/'
              'nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-sparc-UNCOMMITTED.pkg.gz',
@@ -57,7 +61,7 @@
     fc = file_set_checker.FileSetChecker()
     expected = [
         tag.CheckpkgTag(None, 'bad-arch-or-os-release', 'csw-upload-pkg arch=pkg osrel=unspecified'),
-        tag.CheckpkgTag(None, 'bad-vendor-tag', 'csw expected=CSW actual=UNKN'),
+        tag.CheckpkgTag(None, 'bad-vendor-tag', 'filename=csw-upload-pkg expected=CSW actual=UNKN'),
     ]
     files = ['csw-upload-pkg']
     self.assertEqual(expected, fc.CheckFiles(files))


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