[csw-devel] SF.net SVN: gar:[10463] csw/mgar/gar/v2/lib/python
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Tue Jul 6 22:37:06 CEST 2010
Revision: 10463
http://gar.svn.sourceforge.net/gar/?rev=10463&view=rev
Author: wahwah
Date: 2010-07-06 20:37:05 +0000 (Tue, 06 Jul 2010)
Log Message:
-----------
mGAR v2: checkpkg, runpath stored as a tuple, updated the test data.
Modified Paths:
--------------
csw/mgar/gar/v2/lib/python/dependency_checks.py
csw/mgar/gar/v2/lib/python/package_checks_test.py
csw/mgar/gar/v2/lib/python/testdata/checkpkg_pkgs_data_minimal.py
csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py
csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py
Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-07-06 20:06:32 UTC (rev 10462)
+++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-07-06 20:37:05 UTC (rev 10463)
@@ -31,7 +31,7 @@
binary_info["path"],
binary_info["runpath"],
path_list)
- runpath_list = binary_info["runpath"] + tuple(checkpkg.SYS_DEFAULT_RUNPATH)
+ runpath_list = tuple(binary_info["runpath"]) + tuple(checkpkg.SYS_DEFAULT_RUNPATH)
for runpath in runpath_list:
resolved_path = ldd_emulator.ResolveSoname(runpath,
soname,
Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-07-06 20:06:32 UTC (rev 10462)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-07-06 20:37:05 UTC (rev 10463)
@@ -266,12 +266,12 @@
'libm.so.1',
'libc.so.1'],
'path': 'opt/csw/lib/libImlib2.so.1.4.2',
- 'runpath': ['/opt/csw/lib/$ISALIST',
+ 'runpath': ('/opt/csw/lib/$ISALIST',
'/opt/csw/lib',
'/usr/lib/$ISALIST',
'/usr/lib',
'/lib/$ISALIST',
- '/lib'],
+ '/lib'),
'soname': 'libImlib2.so.1',
'soname_guessed': False,
})
@@ -334,7 +334,7 @@
FUNCTION_NAME = 'CheckRpath'
def CheckpkgTest(self):
binaries_dump_info = self.pkg_data["binaries_dump_info"]
- binaries_dump_info[0]["runpath"] = testdata.rpaths.all_rpaths
+ binaries_dump_info[0]["runpath"] = tuple(testdata.rpaths.all_rpaths)
self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1]
BAD_PATHS = [
'$ORIGIN/..',
@@ -434,7 +434,7 @@
FUNCTION_NAME = 'SetCheckLibraries'
def CheckpkgTest(self):
binaries_dump_info = self.pkg_data["binaries_dump_info"]
- binaries_dump_info[0]["runpath"] = ["/opt/csw/lib"]
+ binaries_dump_info[0]["runpath"] = ("/opt/csw/lib",)
binaries_dump_info[0]["needed sonames"] = ["libdb-4.7.so"]
self.pkg_data["depends"] = (("CSWfoo", None),)
self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1]
@@ -492,11 +492,11 @@
'binaries_dump_info': [{'base_name': 'bar',
'needed sonames': ['libfoo.so.1'],
'path': 'opt/csw/bin/bar',
- 'runpath': ['/opt/csw/lib'],
+ 'runpath': ('/opt/csw/lib',),
'soname': 'rsync',
'soname_guessed': True}],
'depends': (('CSWlibfoo', None),),
- 'isalist': [],
+ 'isalist': (),
'pkgmap': [],
}
CSWlibfoo_DATA = {
@@ -505,7 +505,7 @@
'stats_version': 1},
'binaries_dump_info': [],
'depends': [],
- 'isalist': [],
+ 'isalist': (),
'pkgmap': [],
}
def CheckpkgTest(self):
@@ -526,7 +526,7 @@
FUNCTION_NAME = 'SetCheckLibraries'
def CheckpkgTest(self):
binaries_dump_info = self.pkg_data["binaries_dump_info"]
- binaries_dump_info[0]["runpath"] = []
+ binaries_dump_info[0]["runpath"] = ()
binaries_dump_info[0]["needed sonames"] = ["libbar.so"]
binaries_dump_info[0]["path"] = 'opt/csw/lib/python/site-packages/foo.so'
self.pkg_data["depends"] = tuple()
@@ -545,7 +545,7 @@
FUNCTION_NAME = 'SetCheckLibraries'
def CheckpkgTest(self):
binaries_dump_info = self.pkg_data["binaries_dump_info"]
- binaries_dump_info[0]["runpath"] = []
+ binaries_dump_info[0]["runpath"] = ()
binaries_dump_info[0]["needed sonames"] = ["libnotfound.so"]
binaries_dump_info[0]["path"] = 'opt/csw/lib/foo.so'
self.pkg_data["depends"] = tuple()
Modified: csw/mgar/gar/v2/lib/python/testdata/checkpkg_pkgs_data_minimal.py
===================================================================
--- csw/mgar/gar/v2/lib/python/testdata/checkpkg_pkgs_data_minimal.py 2010-07-06 20:06:32 UTC (rev 10462)
+++ csw/mgar/gar/v2/lib/python/testdata/checkpkg_pkgs_data_minimal.py 2010-07-06 20:37:05 UTC (rev 10463)
@@ -8,7 +8,7 @@
'binaries_dump_info': [{'base_name': 'foo',
'needed sonames': [],
'path': 'opt/csw/bin/foo',
- 'runpath': [
+ 'runpath': (
'/opt/csw/1/lib',
'/opt/csw/lib',
'/lib',
@@ -16,7 +16,7 @@
'/usr/lib/$ISALIST',
'/usr/lib',
'/lib/$ISALIST',
- '/lib'],
+ '/lib'),
'soname': 'foo',
'soname_guessed': True}],
'depends': [],
Modified: csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py
===================================================================
--- csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py 2010-07-06 20:06:32 UTC (rev 10462)
+++ csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py 2010-07-06 20:37:05 UTC (rev 10463)
@@ -31,7 +31,7 @@
'libCrun.so.1',
'libc.so.1'],
'path': 'opt/csw/lib/libdjvulibre.so.15',
- 'runpath': ['/opt/csw/lib/$ISALIST',
+ 'runpath': ('/opt/csw/lib/$ISALIST',
'/opt/csw/lib',
'/opt/SUNWspro/lib/rw7',
'/opt/SUNWspro/lib/v8',
@@ -42,7 +42,7 @@
'/usr/lib/$ISALIST',
'/usr/lib',
'/lib/$ISALIST',
- '/lib'],
+ '/lib'),
'soname': 'libdjvulibre.so.15',
'soname_guessed': False},
{'base_name': 'libdjvulibre.so.21.1.0',
@@ -53,7 +53,7 @@
'libCrun.so.1',
'libc.so.1'],
'path': 'opt/csw/lib/sparcv9/libdjvulibre.so.21.1.0',
- 'runpath': ['/opt/csw/X11/lib/$ISALIST',
+ 'runpath': ('/opt/csw/X11/lib/$ISALIST',
'/opt/csw/X11/lib/64',
'/opt/csw/lib/$ISALIST',
'/opt/csw/lib/64',
@@ -66,7 +66,7 @@
'/usr/lib/$ISALIST',
'/usr/lib',
'/lib/$ISALIST',
- '/lib'],
+ '/lib'),
'soname': 'libdjvulibre.so.21',
'soname_guessed': False},
{'base_name': 'libdjvulibre.so.21.1.0',
@@ -77,7 +77,7 @@
'libCrun.so.1',
'libc.so.1'],
'path': 'opt/csw/lib/libdjvulibre.so.21.1.0',
- 'runpath': ['/opt/csw/X11/lib/$ISALIST',
+ 'runpath': ('/opt/csw/X11/lib/$ISALIST',
'/opt/csw/X11/lib',
'/opt/csw/lib/$ISALIST',
'/opt/csw/lib',
@@ -92,7 +92,7 @@
'/usr/lib/$ISALIST',
'/usr/lib',
'/lib/$ISALIST',
- '/lib'],
+ '/lib'),
'soname': 'libdjvulibre.so.21',
'soname_guessed': False}],
'depends': [('CSWcommon',
@@ -101,7 +101,7 @@
'CSWisaexec isaexec - sneaky wrapper around Sun isaexec '),
('CSWjpeg',
'CSWjpeg jpeg - JPEG library and tools by the Independent JPEG Group ')],
- 'isalist': ['sparcv9+vis2',
+ 'isalist': ('sparcv9+vis2',
'sparcv9+vis',
'sparcv9',
'sparcv8plus+vis2',
@@ -110,7 +110,7 @@
'sparcv8',
'sparcv8-fsmuld',
'sparcv7',
- 'sparc'],
+ 'sparc'),
'overrides': [],
'pkginfo': {'ARCH': 'sparc',
'CATEGORY': 'application',
Modified: csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py
===================================================================
--- csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py 2010-07-06 20:06:32 UTC (rev 10462)
+++ csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py 2010-07-06 20:37:05 UTC (rev 10463)
@@ -33,12 +33,12 @@
'libnsl.so.1',
'libc.so.1'],
'path': 'opt/csw/bin/sparcv9/rsync',
- 'runpath': ['/opt/csw/lib/$ISALIST',
+ 'runpath': ('/opt/csw/lib/$ISALIST',
'/opt/csw/lib/64',
'/usr/lib/$ISALIST',
'/usr/lib',
'/lib/$ISALIST',
- '/lib'],
+ '/lib'),
'soname': 'rsync',
'soname_guessed': True},
{'base_name': 'rsync',
@@ -49,12 +49,12 @@
'libnsl.so.1',
'libc.so.1'],
'path': 'opt/csw/bin/sparcv8/rsync',
- 'runpath': ['/opt/csw/lib/$ISALIST',
+ 'runpath': ('/opt/csw/lib/$ISALIST',
'/opt/csw/lib',
'/usr/lib/$ISALIST',
'/usr/lib',
'/lib/$ISALIST',
- '/lib'],
+ '/lib'),
'soname': 'rsync',
'soname_guessed': True}],
'depends': [['CSWcommon',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list