From 359fd020c07b00d6a5030140acf8967b3e7bcaf5 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sat, 14 Oct 2006 18:06:53 +0000 Subject: [PATCH] Add some prefixes, and don't warn about wheel_group being portage_gid if wheel_group > 500, in which case it probably is a normal user. svn path=/main/branches/prefix/; revision=4694 --- bin/emerge | 4 ++-- pym/portage.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/emerge b/bin/emerge index 79328408e..1effb0e13 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2064,7 +2064,7 @@ class MergeTask(object): print red("!!!") elif len(mymergelist) > 1: print ">>> starting parallel fetching" - fetch_log = "/var/log/emerge-fetch.log" + fetch_log = portage_const.EPREFIX+"/var/log/emerge-fetch.log" logfile = open(fetch_log, "w") fd_pipes = {1:logfile.fileno(), 2:logfile.fileno()} portage_util.apply_secpass_permissions(fetch_log, @@ -4159,7 +4159,7 @@ def emerge_main(): emergehelp.help(myaction, myopts, havecolor) sys.exit(0) - if portage.wheelgid == portage.portage_gid: + if portage.wheelgid == portage.portage_gid and portage.wheelgid > 500: print "emerge: wheel group use is being deprecated. Please update group and passwd to" print " include the portage user as noted above, and then use group portage." diff --git a/pym/portage.py b/pym/portage.py index d6e874d27..062fe903f 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1379,7 +1379,7 @@ class config: for mypath, (gid, mode, modemask) in dir_mode_map.iteritems(): try: - mydir = os.path.join(self["ROOT"], mypath) + mydir = os.path.join(self["ROOT"], self["EPREFIX"], mypath) portage_util.ensure_dirs(mydir, gid=gid, mode=mode, mask=modemask) except portage_exception.PortageException, e: writemsg("!!! Directory initialization failed: '%s'\n" % mydir, -- 2.26.2