[107678] branches/release_2_2

[jmr at macports.org]

Revision: 107678
          https://trac.macports.org/changeset/107678
Author:   jmr at macports.org
Date:     2013-07-04 00:22:12 -0700 (Thu, 04 Jul 2013)
Log Message:
-----------
merge r107674 from trunk:
 temporary workaround for pkg target failure on 10.8: disable sandboxing for that target

Revision Links:
--------------
    https://trac.macports.org/changeset/107674

Modified Paths:
--------------
    branches/release_2_2/base/src/port1.0/portsandbox.tcl

Property Changed:
----------------
    branches/release_2_2/
    branches/release_2_2/base/


Property changes on: branches/release_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:107106,107465,107527
   + /trunk:107106,107465,107527,107674


Property changes on: branches/release_2_2/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:106802,106807,106809,107106,107465,107527
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:106802,106807,106809,107106,107465,107527,107674
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_2/base/src/port1.0/portsandbox.tcl
===================================================================
--- branches/release_2_2/base/src/port1.0/portsandbox.tcl	2013-07-04 06:54:28 UTC (rev 107677)
+++ branches/release_2_2/base/src/port1.0/portsandbox.tcl	2013-07-04 07:22:12 UTC (rev 107678)
@@ -65,7 +65,13 @@
             set allow_dirs [list $distpath]
         }
         pkg {
-            set allow_dirs [list ${package.destpath}]
+            if {${os.major} == 12} {
+                # FIXME: fails on Mountain Lion with the current profile
+                set portsandbox_profile ""
+                return
+            } else {
+                set allow_dirs [list ${package.destpath}]
+            }
         }
         rpm -
         srpm {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130704/29b5bc45/attachment.html>