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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 2db939b82f86d7b5436a6e3cc4436cd327e72d7d..224da52977285e68a6ae4bd1ec5c45ae0ac78deb 100644 (file)
--- 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: