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

[wahwah at users.sourceforge.net]

Revision: 11795
          http://gar.svn.sourceforge.net/gar/?rev=11795&view=rev
Author:   wahwah
Date:     2010-12-05 23:15:04 +0000 (Sun, 05 Dec 2010)

Log Message:
-----------
Merge branch 'master' of file:///home/maciej/public_html/opencsw

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

Modified: csw/mgar/gar/v2/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg.py	2010-12-05 22:59:11 UTC (rev 11794)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2010-12-05 23:15:04 UTC (rev 11795)
@@ -616,8 +616,9 @@
   def Emulate64BitSymlinks(self, runpath_list):
     """Need to emulate the 64 -> amd64, 64 -> sparcv9 symlink
 
-    Since we don't know the architecture, we'll adding both amd64 and sparcv9.
-    It should be safe.
+    Since we don't know the architecture, we are adding both amd64 and
+    sparcv9.  It should be safe - there are other checks that make sure
+    that right architectures are in the right directories.
     """
     key = tuple(runpath_list)
     if key not in self.symlink64_cache:
@@ -633,15 +634,7 @@
 
   def SanitizeRunpath(self, runpath):
     if runpath not in self.runpath_sanitize_cache:
-      new_runpath = runpath
-      while True:
-        if new_runpath.endswith("/"):
-          new_runpath = new_runpath[:-1]
-        elif "//" in new_runpath:
-          new_runpath = new_runpath.replace("//", "/")
-        else:
-          break
-      self.runpath_sanitize_cache[runpath] = new_runpath
+      self.runpath_sanitize_cache[runpath] = os.path.normpath(runpath)
     return self.runpath_sanitize_cache[runpath]
 
 


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