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

[wahwah at users.sourceforge.net]

Revision: 21580
          http://gar.svn.sourceforge.net/gar/?rev=21580&view=rev
Author:   wahwah
Date:     2013-07-30 07:43:51 +0000 (Tue, 30 Jul 2013)
Log Message:
-----------
checkpkg: dynload files are dependent on Python

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/dependency_checks.py
    csw/mgar/gar/v2/lib/python/dependency_checks_test.py

Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks.py	2013-07-29 23:33:37 UTC (rev 21579)
+++ csw/mgar/gar/v2/lib/python/dependency_checks.py	2013-07-30 07:43:51 UTC (rev 21580)
@@ -31,11 +31,11 @@
 DEPENDENCY_FILENAME_REGEXES = (
     (r".*\.pl$",   (u"CSWperl",)),
     (r".*\.pm$",   (u"CSWperl",)),
-    (r"/?opt/csw/lib/python(2\.6)?/site-packages/.+\.py$",
+    (r"/?opt/csw/lib/python(2\.6)?/(site-packages|lib-dynload)/.+\.py$",
                    (u"CSWpython",)),
-    (r"/?opt/csw/lib/python2\.7/site-packages/.+\.py$",
+    (r"/?opt/csw/lib/python2\.7/(site-packages|lib-dynload)/.+\.py$",
                    (u"CSWpython27",)),
-    (r"/?opt/csw/lib/python3\.3/site-packages/.+\.py$",
+    (r"/?opt/csw/lib/python3\.3/(site-packages|lib-dynload)/.+\.py$",
                    (u"CSWpython33",)),
     (r".*\.rb$",   (u"CSWruby", u"CSWruby18", u"CSWruby191", u"CSWlibruby1-9-1-1")),
     (r".*\.elc?$", (u"CSWemacs-common",)),

Modified: csw/mgar/gar/v2/lib/python/dependency_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks_test.py	2013-07-29 23:33:37 UTC (rev 21579)
+++ csw/mgar/gar/v2/lib/python/dependency_checks_test.py	2013-07-30 07:43:51 UTC (rev 21580)
@@ -244,8 +244,9 @@
          'path': '/opt/csw/lib/python/site-packages/foo.py',
          'type': 'f', 'group': 'bin', 'user': 'root'}]
     self.error_mgr_mock.NeedPackage('CSWtree', u'CSWpython',
-        "found file(s) matching /?opt/csw/lib/python(2\\.6)?/site-packages/.+\\.py$, "
-        "e.g. '/opt/csw/lib/python/site-packages/foo.py'")
+        "found file(s) matching "
+        "/?opt/csw/lib/python(2\\.6)?/(site-packages|lib-dynload)/.+"
+        "\\.py$, e.g. '/opt/csw/lib/python/site-packages/foo.py'")
     self.mox.ReplayAll()
     result = dependency_checks.ByFilename(
         self.pkg_data,
@@ -262,8 +263,9 @@
          'path': '/opt/csw/lib/python2.7/site-packages/foo.py',
          'type': 'f', 'group': 'bin', 'user': 'root'}]
     self.error_mgr_mock.NeedPackage('CSWtree', u'CSWpython27',
-        "found file(s) matching /?opt/csw/lib/python2\\.7/site-packages/.+\\.py$, "
-        "e.g. '/opt/csw/lib/python2.7/site-packages/foo.py'")
+        "found file(s) matching "
+        "/?opt/csw/lib/python2\\.7/(site-packages|lib-dynload)/.+"
+        "\\.py$, e.g. '/opt/csw/lib/python2.7/site-packages/foo.py'")
     self.mox.ReplayAll()
     result = dependency_checks.ByFilename(
         self.pkg_data,

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