From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 6 May 2010 19:08:28 +0000 (-0700)
Subject: Eliminate redundant os.sep in vardbapi._bump_mtime. Thanks to
X-Git-Tag: v2.2_rc68~613
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7f54cb4aa5e5a4f7b003e6e07c2ce3b265ff4963;p=portage.git

Eliminate redundant os.sep in vardbapi._bump_mtime. Thanks to
grobian for reporting.
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 1b97c382f..de583e7b5 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -822,6 +822,8 @@ class vardbapi(dbapi):
 		"""
 		self.root = _unicode_decode(root,
 			encoding=_encodings['content'], errors='strict')
+		if self.root[-1] != '/':
+			self.root += '/'
 
 		# Used by emerge to check whether any packages
 		# have been added or removed.
@@ -880,7 +882,7 @@ class vardbapi(dbapi):
 		This is called before an after any modifications, so that consumers
 		can use directory mtimes to validate caches. See bug #290428.
 		"""
-		base = self.root + _os.sep + VDB_PATH
+		base = self.root + VDB_PATH
 		cat = catsplit(cpv)[0]
 		catdir = base + _os.sep + cat
 		t = time.time()