From: Kito <kito@gentoo.org>
Date: Sat, 3 Dec 2005 17:55:10 +0000 (-0000)
Subject: import portage_const, fix absolute paths to respect portage_const.PREFIX
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e3c68b2b3f563064b58505ef88a16780afb90ef1;p=portage.git

import portage_const, fix absolute paths to respect portage_const.PREFIX

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

diff --git a/bin/emerge b/bin/emerge
index b7a47eef0..f3ea73ec8 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -16,7 +16,7 @@ from output import *
 import portage_util
 import portage_locks
 import portage_exception
-
+import portage_const
 
 spinner_msgs = ["Gentoo Rocks ("+os.uname()[0]+")",
                 "Thank you for using Gentoo. :)",
@@ -439,12 +439,13 @@ def emergelog(mystr,short_msg=None):
 			xtermTitle(mystr)
 	try:
 		#seems odd opening a file each write...
-		if not os.path.exists("/var/log/emerge.log"):
-			mylogfile=open("/var/log/emerge.log", "w")
-			os.chmod("/var/log/emerge.log", S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)
-			os.chown("/var/log/emerge.log", portage.portage_uid, portage.portage_gid)
+		elog = portage_const.PREFIX+"/var/log/emerge.log"
+		if not os.path.exists(elog):
+			mylogfile=open(elog, "w")
+			os.chmod(elog, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)
+			os.chown(elog, portage.portage_uid, portage.portage_gid)
 		else:
-			mylogfile=open("/var/log/emerge.log", "a")
+			mylogfile=open(elog, "a")
 
 		l=portage_locks.lockfile(mylogfile)
 		# seek because we may have gotten held up by the lock.
@@ -567,7 +568,7 @@ def getgccversion():
 def getportageversion():
 	try:
 		import re
-		profilever = os.path.normpath("///"+os.readlink("/etc/make.profile"))
+		profilever = os.path.normpath("///"+os.readlink(portage_const.PREFIX+"/etc/make.profile"))
 		basepath   = os.path.normpath("///"+portage.settings["PORTDIR"]+"/profiles")
 		if re.match(basepath,profilever):
 			profilever = profilever[len(basepath)+1:]
@@ -2401,7 +2402,7 @@ if myaction in ["sync","rsync","metadata"] and (not "--help" in myopts):
 		updatecache_flg = True
 		tmpservertimestampfile = None
 	elif syncuri[:8]=="rsync://":
-		if not os.path.exists("rsync"):
+		if not os.path.exists(os.path.normpath(portage_const.PREFIX+"/usr/bin/rsync")):
 			print "!!! rsync does not exist, so rsync support is disabled."
 			print "!!! Type \"emerge net-misc/rsync\" to enable rsync support."
 			sys.exit(1)
@@ -2830,8 +2831,8 @@ elif "info"==myaction:
 	print getportageversion()
 	print "================================================================="
 	print "System uname: "+unameout
-	if os.path.exists("/etc/gentoo-release"):
-		os.system("cat /etc/gentoo-release")
+	if os.path.exists(portage_const.PREFIX+"/etc/gentoo-release"):
+		os.system("cat "+portage_const.PREFIX+"/etc/gentoo-release")
 	else:
 		print "Unknown Host Operating System"