From a9369fc520d328d98bd54407be7e3c673626af13 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 30 Jan 2008 18:45:49 +0000 Subject: [PATCH] use strip(os.sep) on paths prior to os.path.join (branches/prefix r9228) svn path=/main/trunk/; revision=9230 --- pym/portage/dbapi/vartree.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 98f751f50..3ce61424a 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1599,7 +1599,7 @@ class dblink(object): import shutil for x in preserve_paths: print "injecting %s into %s" % (x, srcroot) - mydir = os.path.join(srcroot, os.path.dirname(x)) + mydir = os.path.join(srcroot, os.path.dirname(x).lstrip(os.sep)) if not os.path.exists(mydir): os.makedirs(mydir) @@ -1613,7 +1613,8 @@ class dblink(object): linktarget = os.path.join(os.path.dirname(x), linktarget) preserve_paths.append(linktarget) else: - shutil.copy2(os.path.join(destroot, x), os.path.join(srcroot, x.lstrip(os.sep))) + shutil.copy2(os.path.join(destroot, x.lstrip(os.sep)), + os.path.join(srcroot, x.lstrip(os.sep))) # keep track of the libs we preserved self.vartree.dbapi.plib_registry.register(self.mycpv, self.settings["SLOT"], counter, preserve_paths) -- 2.26.2