From 7f54cb4aa5e5a4f7b003e6e07c2ce3b265ff4963 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 6 May 2010 12:08:28 -0700 Subject: Eliminate redundant os.sep in vardbapi._bump_mtime. Thanks to grobian for reporting. --- pym/portage/dbapi/vartree.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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() -- cgit v1.2.3-1-g7c22