[137851] branches/gsoc15-dependency/base

[ijackson at macports.org]

Revision: 137851
          https://trac.macports.org/changeset/137851
Author:   ijackson at macports.org
Date:     2015-06-21 14:28:25 -0700 (Sun, 21 Jun 2015)
Log Message:
-----------
Merge macports-trunk/base with branches/gsoc15-dependency/base
Merge revisions r137285-137850. r137850 fixes incorrect use of
'array get' to 'array name' in action search (port.tcl). 
This fix is necessary for libsolv::search as $field was been set "yes".

Revision Links:
--------------
    https://trac.macports.org/changeset/137285
    https://trac.macports.org/changeset/137850

Modified Paths:
--------------
    branches/gsoc15-dependency/base/src/macports1.0/macports.tcl
    branches/gsoc15-dependency/base/src/macports1.0/macports_util.tcl
    branches/gsoc15-dependency/base/src/port/port.tcl
    branches/gsoc15-dependency/base/src/port1.0/porttrace.tcl

Property Changed:
----------------
    branches/gsoc15-dependency/base/


Property changes on: branches/gsoc15-dependency/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/gsoc14-cleanup:123738-124046
/branches/gsoc14-interactive/base:119516-124240
/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:136782-137284
/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/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/gsoc14-cleanup:123738-124046
/branches/gsoc14-interactive/base:119516-124240
/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:136782-137850
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/gsoc15-dependency/base/src/macports1.0/macports.tcl
===================================================================
--- branches/gsoc15-dependency/base/src/macports1.0/macports.tcl	2015-06-21 21:10:45 UTC (rev 137850)
+++ branches/gsoc15-dependency/base/src/macports1.0/macports.tcl	2015-06-21 21:28:25 UTC (rev 137851)
@@ -2626,7 +2626,7 @@
                 } catch {{POSIX SIG SIGTERM} eCode eMessage} {
                     throw
                 } catch {{*} eCode eMessage} {
-                    ui_error [msgcat::mc "Fetching %s failed: %s" $source $error]
+                    ui_error [msgcat::mc "Fetching %s failed: %s" $source $eMessage]
                     incr numfailed
                     continue
                 }
@@ -3079,7 +3079,11 @@
                 set offset [tell $indexfd]
             }
             puts -nonewline $quickfd $quicklist
-        } catch * {
+        } catch {{POSIX SIG SIGINT} eCode eMessage} {
+            throw
+        } catch {{POSIX SIG SIGTERM} eCode eMessage} {
+            throw
+        } catch {{*} eCode eMessage} {
             ui_warn "It looks like your PortIndex file $index may be corrupt."
             throw
         } finally {

Modified: branches/gsoc15-dependency/base/src/macports1.0/macports_util.tcl
===================================================================
--- branches/gsoc15-dependency/base/src/macports1.0/macports_util.tcl	2015-06-21 21:10:45 UTC (rev 137850)
+++ branches/gsoc15-dependency/base/src/macports1.0/macports_util.tcl	2015-06-21 21:28:25 UTC (rev 137851)
@@ -1,4 +1,5 @@
-# macports.tcl
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# macports_util.tcl
 # $Id$
 #
 # Copyright (c) 2007 Kevin Ballard <eridius at macports.org>

Modified: branches/gsoc15-dependency/base/src/port/port.tcl
===================================================================
--- branches/gsoc15-dependency/base/src/port/port.tcl	2015-06-21 21:10:45 UTC (rev 137850)
+++ branches/gsoc15-dependency/base/src/port/port.tcl	2015-06-21 21:28:25 UTC (rev 137851)
@@ -3713,7 +3713,7 @@
 
         set res {}
         set portfound 0
-        foreach { opt } [array get filters] {
+        foreach { opt } [array names filters] {
             # Map from friendly name
             set opt [map_friendly_field_names $opt]
 

Modified: branches/gsoc15-dependency/base/src/port1.0/porttrace.tcl
===================================================================
--- branches/gsoc15-dependency/base/src/port1.0/porttrace.tcl	2015-06-21 21:10:45 UTC (rev 137850)
+++ branches/gsoc15-dependency/base/src/port1.0/porttrace.tcl	2015-06-21 21:28:25 UTC (rev 137851)
@@ -197,9 +197,7 @@
 		allow trace_sandbox "/Library"
 
 		# Allow a few configuration files
-		allow trace_sandbox "/etc/passwd"
-		allow trace_sandbox "/etc/groups"
-		allow trace_sandbox "/etc/localtime"
+		allow trace_sandbox "/etc"
 
 		# Allow temporary locations
 		allow trace_sandbox "/tmp"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150621/dbaad11b/attachment.html>