[54978] branches/images-and-archives/base

[blb at macports.org]

Revision: 54978
          http://trac.macports.org/changeset/54978
Author:   blb at macports.org
Date:     2009-08-04 23:26:34 -0700 (Tue, 04 Aug 2009)
Log Message:
-----------
Merge from trunk

Modified Paths:
--------------
    branches/images-and-archives/base/src/macports1.0/macports.tcl
    branches/images-and-archives/base/src/port/port.tcl
    branches/images-and-archives/base/src/port1.0/portfetch.tcl
    branches/images-and-archives/base/src/port1.0/portmain.tcl

Property Changed:
----------------
    branches/images-and-archives/base/


Property changes on: branches/images-and-archives/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/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:50249-54893
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/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:50249-54977
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/images-and-archives/base/src/macports1.0/macports.tcl
===================================================================
--- branches/images-and-archives/base/src/macports1.0/macports.tcl	2009-08-05 06:22:26 UTC (rev 54977)
+++ branches/images-and-archives/base/src/macports1.0/macports.tcl	2009-08-05 06:26:34 UTC (rev 54978)
@@ -1410,7 +1410,9 @@
         if {[mportdepends $mport $target] != 0} {
             return 1
         }
-        ui_msg ""
+        if {![macports::ui_isset ports_debug]} {
+            ui_msg ""
+        }
 
         # Select out the dependents along the critical path,
         # but exclude this mport, we might not be installing it.

Modified: branches/images-and-archives/base/src/port/port.tcl
===================================================================
--- branches/images-and-archives/base/src/port/port.tcl	2009-08-05 06:22:26 UTC (rev 54977)
+++ branches/images-and-archives/base/src/port/port.tcl	2009-08-05 06:26:34 UTC (rev 54978)
@@ -1999,6 +1999,12 @@
     if {[require_portlist portlist]} {
         return 1
     }
+    # stop upgrade from being called via mportexec as well
+    set orig_nodeps yes
+    if {![info exists macports::global_options(ports_nodeps)]} {
+        set macports::global_options(ports_nodeps) yes
+        set orig_nodeps no
+    }
     # shared depscache for all ports in the list
     array set depscache {}
     set status 0
@@ -2017,11 +2023,17 @@
             
             set status [macports::upgrade $portname "port:$portname" $global_variations_list $variations_list [array get options] depscache]
             if {$status != 0 && ![macports::ui_isset ports_processall]} {
+                if {!$orig_nodeps} {
+                    unset -nocomplain macports::global_options(ports_nodeps)
+                }
                 return $status
             }
         }
     }
 
+    if {!$orig_nodeps} {
+        unset -nocomplain macports::global_options(ports_nodeps)
+    }
     return $status
 }
 

Modified: branches/images-and-archives/base/src/port1.0/portfetch.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portfetch.tcl	2009-08-05 06:22:26 UTC (rev 54977)
+++ branches/images-and-archives/base/src/port1.0/portfetch.tcl	2009-08-05 06:26:34 UTC (rev 54978)
@@ -90,7 +90,7 @@
 default svn.method {export}
 default svn.revision ""
 default svn.env {}
-default svn.pre_args "--non-interactive --trust-server-cert"
+default svn.pre_args {"--non-interactive --trust-server-cert"}
 default svn.args ""
 default svn.post_args {"${svn.url}"}
 

Modified: branches/images-and-archives/base/src/port1.0/portmain.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portmain.tcl	2009-08-05 06:22:26 UTC (rev 54977)
+++ branches/images-and-archives/base/src/port1.0/portmain.tcl	2009-08-05 06:26:34 UTC (rev 54978)
@@ -150,7 +150,6 @@
     set portbuildpath "${altprefix}${portbuildpath}"
 
     ui_debug "Going to use alternate build prefix: $altprefix"
-    ui_debug "portbuildpath = $portbuildpath"
     ui_debug "workpath = $workpath"
 } else {
     set usealtworkpath no
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090804/892ebc2d/attachment.html>