From: Kito <kito@gentoo.org>
Date: Fri, 27 Jan 2006 20:09:21 +0000 (-0000)
Subject: More leading slashes, yea.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=14fa8a69642da7fabeb990331f63c53701d55d65;p=portage.git

More leading slashes, yea.

svn path=/main/branches/prefix/; revision=2597
---

diff --git a/pym/portage.py b/pym/portage.py
index 629390d6f..65e86825e 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -523,11 +523,11 @@ endversion_keys = ["pre", "p", "alpha", "beta", "rc"]
 
 def env_update(makelinks=1):
 	global root
-	if not os.path.exists(root+portage_const.PREFIX+"etc/env.d"):
+	if not os.path.exists(root+portage_const.PREFIX+"/etc/env.d"):
 		prevmask=os.umask(0)
-		os.makedirs(root+portage_const.PREFIX+"etc/env.d",0755)
+		os.makedirs(root+portage_const.PREFIX+"/etc/env.d",0755)
 		os.umask(prevmask)
-	fns=listdir(root+portage_const.PREFIX+"etc/env.d",EmptyOnError=1)
+	fns=listdir(root+portage_const.PREFIX+"/etc/env.d",EmptyOnError=1)
 	fns.sort()
 	pos=0
 	while (pos<len(fns)):
@@ -558,7 +558,7 @@ def env_update(makelinks=1):
 		# don't process backup files
 		if x[-1]=='~' or x[-4:]==".bak":
 			continue
-		myconfig=getconfig(root+portage_const.PREFIX+"etc/env.d/"+x)
+		myconfig=getconfig(root+portage_const.PREFIX+"/etc/env.d/"+x)
 		if myconfig==None:
 			writemsg("!!! Parsing error in "+str(root)+portage_const.PREFIX+"etc/env.d/"+str(x)+"\n")
 			#parse error
@@ -600,7 +600,7 @@ def env_update(makelinks=1):
 		#ld.so.conf needs updating and ldconfig needs to be run
 		myfd=open(root+portage_const.PREFIX+"/etc/ld.so.conf","w")
 		myfd.write("# ld.so.conf autogenerated by env-update; make all changes to\n")
-		myfd.write("# contents of "+portage_const.PREFIX+"etc/env.d directory\n")
+		myfd.write("# contents of "+portage_const.PREFIX+"/etc/env.d directory\n")
 		for x in specials["LDPATH"]:
 			myfd.write(x+"\n")
 		myfd.close()