From 3a4e69f71f6dcdfc3c2bacd87d8094f5eef32a37 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Mon, 26 Feb 2007 22:32:13 +0000 Subject: [PATCH] The new counter_tick_core method code seems to get the prefix automagically (via VDB_PATH), so no need to add prefix as well. That actually breaks merging. svn path=/main/branches/prefix/; revision=6085 --- pym/portage/dbapi/vartree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 2db939b82..224da5297 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -461,7 +461,7 @@ class vardbapi(dbapi): def counter_tick_core(self, myroot, incrementing=1, mycpv=None): "This method will grab the next COUNTER value and record it back to the global file. Returns new counter value." - cpath = os.path.join(myroot + EPREFIX, CACHE_PATH.lstrip(os.sep), "counter") + cpath = os.path.join(myroot, CACHE_PATH.lstrip(os.sep), "counter") changed = 0 min_counter = 0 if mycpv: -- 2.26.2