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

[wahwah at users.sourceforge.net]

Revision: 8374
          http://gar.svn.sourceforge.net/gar/?rev=8374&view=rev
Author:   wahwah
Date:     2010-02-07 13:29:34 +0000 (Sun, 07 Feb 2010)

Log Message:
-----------
mGAR v2: checkpkg, filtering out SUNW packages from missing deps.

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

Modified: csw/mgar/gar/v2/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg.py	2010-02-07 11:58:17 UTC (rev 8373)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2010-02-07 13:29:34 UTC (rev 8374)
@@ -22,9 +22,9 @@
 SONAME = "soname"
 CONFIG_MTIME = "mtime"
 DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"])
-DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms",
-                             u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms",
-                             u"SUNWcslx"])
+DO_NOT_REPORT_MISSING = set([])
+DO_NOT_REPORT_MISSING_RE = [r"SUNW.*", r"\*SUNW.*"]
+
 SYSTEM_SYMLINKS = (
     ("/opt/csw/bdb4", ["/opt/csw/bdb42"]),
     ("/64", ["/amd64", "/sparcv9"]),
@@ -405,6 +405,11 @@
   # Don't report itself as a suggested dependency.
   missing_deps = missing_deps.difference(set([pkgname]))
   missing_deps = missing_deps.difference(set(DO_NOT_REPORT_MISSING))
+  for re_str in DO_NOT_REPORT_MISSING_RE:
+    padded_re = "^%s$" % re_str
+    missing_deps = filter(lambda x: not re.match(padded_re, x),
+                          missing_deps)
+  missing_deps = set(missing_deps)
   surplus_deps = declared_dependencies_set.difference(auto_dependencies)
   surplus_deps = surplus_deps.difference(DO_NOT_REPORT_SURPLUS)
   orphan_sonames = orphan_sonames.difference(ALLOWED_ORPHAN_SONAMES)
@@ -594,11 +599,11 @@
         for tag in set_errors:
           if tag.pkgname:
             if not tag.pkgname in errors:
-            	errors[tag.pkgname] = []
+              errors[tag.pkgname] = []
             errors[tag.pkgname].append(tag)
           else:
             if "package-set" not in errors:
-            	errors["package-set"] = []
+              errors["package-set"] = []
             errors["package-set"].append(error)
     return errors
 

Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_test.py	2010-02-07 11:58:17 UTC (rev 8373)
+++ csw/mgar/gar/v2/lib/python/checkpkg_test.py	2010-02-07 13:29:34 UTC (rev 8374)
@@ -151,7 +151,7 @@
 
   def testMissingDeps(self):
     # This tends to report itself...
-    expected = set([u'SUNWgss'])
+    expected = set([])
     self.assertEquals(expected, self.missing_deps)
 
 


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