Remove redundant CUSTOM_PROFILE_PATH from the PROFILE_PATHS variable so
authorZac Medico <zmedico@gentoo.org>
Fri, 28 Mar 2008 11:46:29 +0000 (11:46 -0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 28 Mar 2008 11:46:29 +0000 (11:46 -0000)
that /etc/portage/profile/profile.bashrc will only be sourced once if
it exists. (trunk r9435)

svn path=/main/branches/2.1.2/; revision=9548

pym/portage.py

index 842bc71511675747e6ad830f60800edc89b0a583..40156ca344e372bc17483e807e78280db6fe10b4 100644 (file)
@@ -3932,7 +3932,7 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m
        mysettings["ECLASSDIR"]   = mysettings["PORTDIR"]+"/eclass"
        mysettings["SANDBOX_LOG"] = mycpv.replace("/", "_-_")
 
-       mysettings["PROFILE_PATHS"] = "\n".join(mysettings.profiles)+"\n"+CUSTOM_PROFILE_PATH
+       mysettings["PROFILE_PATHS"] = "\n".join(mysettings.profiles)
        mysettings["P"]  = mysplit[0]+"-"+mysplit[1]
        mysettings["PN"] = mysplit[0]
        mysettings["PV"] = mysplit[1]