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

[wahwah at users.sourceforge.net]

Revision: 13833
          http://gar.svn.sourceforge.net/gar/?rev=13833&view=rev
Author:   wahwah
Date:     2011-03-16 08:19:51 +0000 (Wed, 16 Mar 2011)

Log Message:
-----------
checkpkg: /opt/csw/lib/sparcv8 -> /opt/csw/lib

Some packages have pkgmap entries such as /opt/csw/lib/sparcv8/libfoo.so.1.
However, /opt/csw/lib/sparcv8 is a symlink, not a directory, so physical files
end up elsewhere: in /opt/csw/lib.  This mismatch between the pkgmap entry and
physical file on disk needs to be tackled in checkpkg.

Signed-off-by: Maciej Blizinski <maciej at opencsw.org>

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/common_constants.py
    csw/mgar/gar/v2/lib/python/ldd_emul_test.py

Property Changed:
----------------
    csw/mgar/gar/v2/lib/python/ldd_emul_test.py

Modified: csw/mgar/gar/v2/lib/python/common_constants.py
===================================================================
--- csw/mgar/gar/v2/lib/python/common_constants.py	2011-03-16 08:19:14 UTC (rev 13832)
+++ csw/mgar/gar/v2/lib/python/common_constants.py	2011-03-16 08:19:51 UTC (rev 13833)
@@ -14,6 +14,7 @@
     ("/opt/csw/bdb4",     ("/opt/csw/bdb42",)),
     ("/64",               ("/amd64", "/sparcv9")),
     ("/opt/csw/lib/i386", ("/opt/csw/lib",)),
+    ("/opt/csw/lib/sparcv8", ("/opt/csw/lib",)),
 )
 
 DEFAULT_INSTALL_CONTENTS_FILE = "/var/sadm/install/contents"

Modified: csw/mgar/gar/v2/lib/python/ldd_emul_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/ldd_emul_test.py	2011-03-16 08:19:14 UTC (rev 13832)
+++ csw/mgar/gar/v2/lib/python/ldd_emul_test.py	2011-03-16 08:19:51 UTC (rev 13833)
@@ -1,3 +1,5 @@
+#!/usr/bin/env python2.6
+
 import unittest
 import ldd_emul
 import mox
@@ -123,25 +125,37 @@
     self.assertFalse(not_expected in result,
                      "%s is in %s" % (not_expected, result))
 
-  def testEmulateSymlinks_5(self):
+  def SystemLibSymlinkExpansion_LibPresent(self, lib_symlink):
     """Install time symlink expansion."""
-    runpath_list = ["/opt/csw/lib/i386"]
+    runpath_list = [lib_symlink]
     expected = "/opt/csw/lib"
     result = self.e.Emulate64BitSymlinks(runpath_list)
     self.assertTrue(expected in result, "%s not in %s" % (expected, result))
 
-  def testEmulateSymlinks_6(self):
+  def SystemLibSymlinkExpansion_LibSubdirAbsent(self, lib_symlink):
     """ExpandSymlink for /opt/csw/lib/i386."""
-    runpath_list = ["/opt/csw/lib/i386"]
+    runpath_list = [lib_symlink]
     expected = "/opt/csw/lib"
-    not_expected = "/opt/csw/lib/i386"
-    result = self.e.ExpandSymlink("/opt/csw/lib/i386",
-                                    "/opt/csw/lib",
-                                    "/opt/csw/lib/i386")
+    not_expected = lib_symlink
+    result = self.e.ExpandSymlink(lib_symlink,
+                                  "/opt/csw/lib",
+                                  lib_symlink)
     self.assertTrue(expected in result, "%s not in %s" % (expected, result))
     self.assertFalse(not_expected in result,
                      "%s is in %s" % (not_expected, result))
 
+  def testLibPresent_i386(self):
+    self.SystemLibSymlinkExpansion_LibPresent("/opt/csw/lib/i386")
+
+  def testLibPresent_sparcv8(self):
+    self.SystemLibSymlinkExpansion_LibPresent("/opt/csw/lib/sparcv8")
+
+  def testLibSubdirAbsent_i386(self):
+    self.SystemLibSymlinkExpansion_LibSubdirAbsent("/opt/csw/lib/i386")
+
+  def testLibSubdirAbsent_sparcv8(self):
+    self.SystemLibSymlinkExpansion_LibSubdirAbsent("/opt/csw/lib/sparcv8")
+
   def testSanitizeRunpath_1(self):
     self.assertEqual("/opt/csw/lib",
                      self.e.SanitizeRunpath("/opt/csw/lib/"))


Property changes on: csw/mgar/gar/v2/lib/python/ldd_emul_test.py
___________________________________________________________________
Added: svn:executable
   + *


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