Use apply_recursive_permissions for DISTCC_DIR.

svn path=/main/trunk/; revision=2928

diff --git a/pym/portage.py b/pym/portage.py
index b4c7d4f4e111dad598336e74fee847ba60992b94..f29f0f53150e75318732808621f33eaa71a0160c 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2630,13 +2630,10 @@ def prepare_build_dirs(myroot, mysettings, cleanup):
                                        break
                                else:
                                        raise
-                       try:
-                               distcc_enabled = apply_secpass_permissions(mydir,
-                               uid=portage_uid, gid=portage_gid, mode=02775)
-                       except portage_exception.OperationNotPermitted, e:
-                               writemsg("Operation Not Permitted: %s\n" % str(e))
-                               distcc_enabled = False
-                               break
+
+               distcc_enabled = apply_recursive_permissions(
+               mysettings["DISTCC_DIR"], gid=portage_gid,
+               dirmode=02070, dirmask=02, filemode=060, filemask=02)
 
                if not distcc_enabled:
                        writemsg("\n!!! File system problem when setting DISTCC_DIR directory permissions.\n")