From 2b68c711bc37fe45c940a498227f2c367335b659 Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 5 Sep 2009 10:00:22 +0000
Subject: [PATCH] Fix usage of VDB_PATH

svn path=/main/trunk/; revision=14187
---
 bin/archive-conf             | 2 +-
 bin/ebuild                   | 2 +-
 pym/portage/dbapi/vartree.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/archive-conf b/bin/archive-conf
index aca8d285c..f9a4d5724 100755
--- 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 3362dff4c..18abb00e8 100755
--- 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 c8a045dc4..23710cd2e 100644
--- 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
 
-- 
2.26.2