summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-03-06 00:38:34 +0000
committerZac Medico <zmedico@gentoo.org>2006-03-06 00:38:34 +0000
commitbaaedc7906ce2ab15fbf69900b45b46590b40346 (patch)
tree5f819ea381b5739e7af40979e858bf10f26f07ed /bin/regenworld
parentfix BASH_ARGV walking (diff)
downloadportage-multirepo-baaedc7906ce2ab15fbf69900b45b46590b40346.tar.gz
portage-multirepo-baaedc7906ce2ab15fbf69900b45b46590b40346.tar.bz2
portage-multirepo-baaedc7906ce2ab15fbf69900b45b46590b40346.zip
Remove the leading / from WORLD_FILE for better cooperation with os.path.join (see bug #124471).
svn path=/main/trunk/; revision=2818
Diffstat (limited to 'bin/regenworld')
-rwxr-xr-xbin/regenworld6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/regenworld b/bin/regenworld
index 8723d7f2..221412dd 100755
--- a/bin/regenworld
+++ b/bin/regenworld
@@ -5,7 +5,7 @@
import sys
sys.path.insert(0, "/usr/lib/portage/pym")
-
+import os
import portage, string, re
__candidatematcher__ = re.compile("^[0-9]+: \\*\\*\\* emerge ")
@@ -44,7 +44,7 @@ if len(sys.argv) >= 2 and sys.argv[1] in ["-h", "--help"]:
print "your existing world file (%s) before using this tool." % portage.WORLD_FILE
sys.exit(0)
-worldlist = portage.grabfile(portage.WORLD_FILE)
+worldlist = portage.grabfile(os.path.join("/", portage.WORLD_FILE))
syslist = portage.settings.packages
syslist = filter(issyspkg, syslist)
@@ -88,4 +88,4 @@ for mykey in biglist:
print "add to world:",myfavkey
worldlist.append(myfavkey)
-portage.write_atomic(portage.WORLD_FILE,"\n".join(worldlist))
+portage.write_atomic(os.path.join("/", portage.WORLD_FILE), "\n".join(worldlist))