[patch] fix two bugs in previous patch to get it work

portage-affix-2.patch (text/plain), 1.58 KB, created by Michael Haubenwallner (RETIRED) on 2005-04-04 23:49:49 UTC

Index: pym/ebuild.py
===================================================================
RCS file: /cvsroot/portage/pym/ebuild.py,v
retrieving revision 1.6
diff -u -r1.6 ebuild.py
--- pym/ebuild.py	4 Apr 2005 07:19:12 -0000	1.6
+++ pym/ebuild.py	5 Apr 2005 06:45:47 -0000
@@ -907,7 +907,7 @@
 					os.chmod(mysettings["PORT_LOGDIR"],00770)
 					if not mysettings.has_key("LOG_PF") or (mysettings["LOG_PF"] != mysettings["PF"]):
 						mysettings["LOG_PF"]=mysettings["PF"]
-						mysettings["LOG_COUNTER"]=str(db[myroot()]["vartree"].dbapi.get_counter_tick_core("/"))
+						mysettings["LOG_COUNTER"]=str(db[myroot()]["vartree"].dbapi.get_counter_tick_core(MYROOT))
 					mysettings["PORTAGE_LOGFILE"]="%s/%s-%s.log" % (mysettings["PORT_LOGDIR"],mysettings["LOG_COUNTER"],mysettings["LOG_PF"])
 					if os.path.exists(mysettings["PORTAGE_LOGFILE"]):
 						os.chmod(mysettings["PORTAGE_LOGFILE"], 0664)
Index: bin/ebuild-default-functions.sh
===================================================================
RCS file: /cvsroot/portage/bin/ebuild-default-functions.sh,v
retrieving revision 1.8
diff -u -r1.8 ebuild-default-functions.sh
--- bin/ebuild-default-functions.sh	25 Mar 2005 09:41:48 -0000	1.8
+++ bin/ebuild-default-functions.sh	5 Apr 2005 06:45:47 -0000
@@ -464,7 +464,7 @@
 		# Too annoying - uncommenting this as it's a regression - it's not, commenting again
 		#ewarn "file $file was installed with group portage!"
 		s=$(stat_perms "$file")
-		if [ "/@affix@" != "/"]; then
+		if [ "/@affix@" != "/" ]; then
 			chgrp @wheelgroup@ "$file"
 		elif [ "$USERLAND" == "BSD" ]; then
 			chgrp wheel "$file"