Fix usage of VDB_PATH

svn path=/main/trunk/; revision=14187

diff --git a/bin/archive-conf b/bin/archive-conf
index aca8d285c90b816f352a843521a4a09a357a054a..f9a4d5724c5df61a016b72165cc6bd997fde6b4b 100755 (executable)
--- a/bin/archive-conf
+++ b/bin/archive-conf
@@ -62,7 +62,7 @@ def archive_conf():
         md5_match_hash[conf] = ''
 
     # Find all the CONTENT files in VDB_PATH.
-    content_files += os.popen(FIND_EXTANT_CONTENTS % (portage.root+portage.VDB_PATH)).readlines()
+    content_files += os.popen(FIND_EXTANT_CONTENTS % (os.path.join(portage.root, portage.VDB_PATH))).readlines()
 
     # Search for the saved md5 checksum of all the specified config files
     # and see if the current file is unmodified or not.

diff --git a/bin/ebuild b/bin/ebuild
index 3362dff4ccd8b57206c3d6c4060d0b2eb24ea536..18abb00e862222d177c5d940caeb3d96acf572b9 100755 (executable)
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -135,7 +135,7 @@ if not portage.catpkgsplit(cpv):
        print "!!! %s does not follow correct package syntax." % (cpv)
        sys.exit(1)
 
-if ebuild.startswith(portage.root + portage.const.VDB_PATH):
+if ebuild.startswith(os.path.join(portage.root, portage.const.VDB_PATH)):
        mytree = "vartree"
 
        portage_ebuild = portage.db[portage.root][mytree].dbapi.findname(cpv)

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index c8a045dc4dfebecb98859f8104b095f9836d5b1c..23710cd2e6df388c7096ece6906afd48318cfded 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1069,7 +1069,7 @@ class vardbapi(dbapi):
                        return list(self._iter_match(mydep,
                                self.cp_list(mydep.cp, use_cache=use_cache)))
                try:
-                       curmtime = os.stat(self.root+VDB_PATH+"/"+mycat).st_mtime
+                       curmtime = os.stat(os.path.join(self.root, VDB_PATH, mycat)).st_mtime
                except (IOError, OSError):
                        curmtime=0