diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-03-06 00:38:34 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-03-06 00:38:34 +0000 |
| commit | baaedc7906ce2ab15fbf69900b45b46590b40346 (patch) | |
| tree | 5f819ea381b5739e7af40979e858bf10f26f07ed /bin/emerge | |
| parent | 5e2a21a7ee17f96501c46eff41b5b9ed09a55a12 (diff) | |
| download | portage-baaedc7906ce2ab15fbf69900b45b46590b40346.tar.gz portage-baaedc7906ce2ab15fbf69900b45b46590b40346.tar.bz2 portage-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/emerge')
| -rwxr-xr-x | bin/emerge | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/emerge b/bin/emerge index 4afe24432..d0682aabd 100755 --- a/bin/emerge +++ b/bin/emerge @@ -835,7 +835,7 @@ def getlist(mode): mylines=portage.settings.packages elif mode=="world": try: - myfile=open(portage.root+portage.WORLD_FILE,"r") + myfile = open(os.path.join(portage.root, portage.WORLD_FILE), "r") mylines=myfile.readlines() myfile.close() except OSError: @@ -1843,7 +1843,7 @@ class depgraph: print red("!!! the merge operation manually.") sys.exit(1) else: - myfavs=portage.grabfile(portage.root+portage.WORLD_FILE) + myfavs = portage.grabfile(os.path.join(portage.root, portage.WORLD_FILE)) myfavdict=genericdict(myfavs) for x in range(len(mylist)): if mylist[x][3]!="nomerge": @@ -1862,7 +1862,7 @@ class depgraph: print ">>> Recording",myfavkey,"in \"world\" favorites file..." if not "--fetchonly" in myopts: portage.write_atomic( - os.path.join(portage.root, portage.WORLD_FILE.lstrip(os.sep)), + os.path.join(portage.root, portage.WORLD_FILE), "\n".join(myfavdict.values())) portage.mtimedb["resume"]["mergelist"]=mymergelist[:] @@ -2025,7 +2025,7 @@ class depgraph: portage.db[x[1]]["vartree"].inject(x[2]) myfavkey=portage.cpv_getkey(x[2]) if "--fetchonly" not in myopts and "--fetch-all-uri" not in myopts and myfavkey in favorites: - myfavs=portage.grabfile(myroot+portage.WORLD_FILE) + myfavs = portage.grabfile(os.path.join(myroot, portage.WORLD_FILE)) myfavdict=genericdict(myfavs) mysysdict=genericdict(syslist) #don't record if already in system profile or already recorded @@ -2035,7 +2035,7 @@ class depgraph: print ">>> Recording",myfavkey,"in \"world\" favorites file..." emergelog(" === ("+str(mergecount)+" of "+str(len(mymergelist))+") Updating world file ("+x[pkgindex]+")") portage.write_atomic( - os.path.join(myroot, portage.WORLD_FILE.lstrip(os.sep)), + os.path.join(myroot, portage.WORLD_FILE), "\n".join(myfavdict.values())) if ("noclean" not in portage.features) and (x[0] != "binary"): |