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

[wahwah at users.sourceforge.net]

Revision: 9842
          http://gar.svn.sourceforge.net/gar/?rev=9842&view=rev
Author:   wahwah
Date:     2010-05-08 22:34:55 +0000 (Sat, 08 May 2010)

Log Message:
-----------
mGAR v2: checkpkg, the automatic rpath appending was bollocks, this change removes it. checkpkg was doing the right thing before.

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

Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-05-08 15:59:08 UTC (rev 9841)
+++ csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-05-08 22:34:55 UTC (rev 9842)
@@ -15,13 +15,6 @@
     r'^opt/csw/lib/python/site-packages.*',
 )
 
-def IsDlopenLib(binary_path, locations=DLOPEN_LIB_LOCATIONS):
-  for location in locations:
-    location_re = re.compile(location)
-    if location_re.match(binary_path):
-      return True
-  return False
-
 def Libraries(pkg_data, error_mgr, logger, path_and_pkg_by_soname):
   pkgname = pkg_data["basic_stats"]["pkgname"]
   logger.debug("Package %s", pkgname)
@@ -35,12 +28,6 @@
       logger.debug("%s @ %s: looking for %s in %s",
                    soname, binary_info["path"], binary_info["runpath"], path_list)
       runpath_list = binary_info["runpath"] + checkpkg.SYS_DEFAULT_RUNPATH
-      if IsDlopenLib(binary_info["path"]):
-        # This is a heuristic.  Libraries in certain paths lack the RPATH setting,
-        # but it's not a problem since they are dlopened.
-        for runpath in ("/opt/csw/lib", "/opt/csw/lib/64"):
-          if runpath not in runpath_list:
-            runpath_list.append(runpath)
       for runpath in runpath_list:
         resolved_path = checkpkg.ResolveSoname(runpath, soname, isalist, path_list)
         if resolved_path:

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-05-08 15:59:08 UTC (rev 9841)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-05-08 22:34:55 UTC (rev 9842)
@@ -451,7 +451,9 @@
        u'/opt/csw/lib': [u'CSWlibbar'],
        u'/opt/csw/lib/sparcv9': [u'CSWlibbar'],
     })
-    self.error_mgr_mock.ReportError('CSWrsync', 'missing-dependency', u'CSWlibbar')
+    self.error_mgr_mock.ReportError('CSWrsync', 'soname-not-found',
+                                    'libbar.so is needed by '
+                                    'opt/csw/lib/python/site-packages/foo.so')
     self.pkg_data = [self.pkg_data]
 
 


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