merge with trunk rev 2915:2020

svn path=/main/branches/prefix/; revision=2921

diff --git a/pym/portage.py b/pym/portage.py
index a8e9f40f584192d426b12ac836bcd0d01e4883d9..968b42ba74837ddc3c04831ec4d2540abe15180a 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2824,27 +2824,33 @@ def doebuild(myebuild,mydo,myroot,mysettings,debug=0,listonly=0,fetchonly=0,clea
                fetchme=newuris[:]
                checkme=alist[:]
 
-       try:
-               if not os.path.exists(mysettings["DISTDIR"]):
-                       os.makedirs(mysettings["DISTDIR"])
-               if not os.path.exists(mysettings["DISTDIR"]+"/cvs-src"):
-                       os.makedirs(mysettings["DISTDIR"]+"/cvs-src")
-       except OSError, e:
-               print "!!! File system problem. (Bad Symlink?)"
-               print "!!! Fetching may fail:",str(e)
-
-       try:
-               mystat=os.stat(mysettings["DISTDIR"]+"/cvs-src")
-               if ((mystat[stat.ST_GID]!=portage_gid) or ((mystat[stat.ST_MODE]&02770)!=02770)) and not listonly:
-                       print "*** Adjusting cvs-src permissions for portage user..."
-                       apply_secpass_permissions(mysettings["DISTDIR"]+"/cvs-src",
-                       uid=0, gid=portage_gid, mode=02770, stat_cached=mystat)
-                       spawn("chgrp -R "+str(portage_gid)+" "+mysettings["DISTDIR"]+"/cvs-src", free=1)
-                       spawn("chmod -R g+rw "+mysettings["DISTDIR"]+"/cvs-src", free=1)
-       except SystemExit, e:
-               raise
-       except:
-               pass
+       if not listonly:
+               for x in ("", "cvs-src"):
+                       mydir = os.path.join(mysettings["DISTDIR"], x)
+                       try:
+                               os.makedirs(mydir)
+                       except OSError, oe:
+                               if errno.EEXIST == oe.errno:
+                                       pass
+                               elif errno.EPERM == oe.errno:
+                                       writemsg("!!! %s\n" % str(oe))
+                                       writemsg("!!! Fetching may fail!\n")
+                               else:
+                                       raise
+               try:
+                       apply_secpass_permissions(mysettings["DISTDIR"],
+                               gid=portage_gid, mode=0775, mask=02)
+                       cvs_src_dir = os.path.join(mysettings["DISTDIR"], "cvs-src")
+                       apply_secpass_permissions(cvs_src_dir,
+                               gid=portage_gid, mode=02770, mask=02)
+                       portage_exec.spawn(["chgrp", "-R", str(portage_gid), cvs_src_dir])
+                       portage_exec.spawn(["chmod", "-R", "g+rw", cvs_src_dir])
+                       portage_exec.spawn(["find", cvs_src_dir, "-type", "d",
+                               "-exec","chmod", "g+xs", "{}", ";"])
+               except portage_exception.OperationNotPermitted, e:
+                       writemsg("Operation Not Permitted: %s\n" % str(e))
+               except portage_exception.FileNotFound, e:
+                       writemsg("File Not Found: '%s'\n" % str(e))
 
        # Only try and fetch the files if we are going to need them ... otherwise,
        # if user has FEATURES=noauto and they run `ebuild clean unpack compile install`,

diff --git a/pym/portage_util.py b/pym/portage_util.py
index 61730c5fefa1141cb81762e8e77a498445f73311..9956b107d69550dd0c6bf934f5035fafd7b56988 100644 (file)
--- a/pym/portage_util.py
+++ b/pym/portage_util.py
@@ -495,9 +495,9 @@ def apply_permissions(filename, uid=-1, gid=-1, mode=-1, mask=-1,
                else:
                        mode = mode & 07777
                if      (mode & st_mode != mode) or \
-                       (mask ^ st_mode != st_mode):
+                       ((mask ^ st_mode) & st_mode != st_mode):
                        new_mode = mode | st_mode
-                       new_mode = mask ^ new_mode
+                       new_mode = (mask ^ new_mode) & new_mode
        elif mode != -1:
                mode = mode & 07777 # protect from unwanted bits
                if mode != st_mode: