[48234] branches/release_1_7

[blb at macports.org]

Revision: 48234
          http://trac.macports.org/changeset/48234
Author:   blb at macports.org
Date:     2009-03-17 01:36:09 -0700 (Tue, 17 Mar 2009)
Log Message:
-----------
Merge r46052 from trunk: Error out when asked to upgrade a port that is not installed, e.g. the infamous "port upgrade all"

Modified Paths:
--------------
    branches/release_1_7/base/src/port/port.tcl

Property Changed:
----------------
    branches/release_1_7/
    branches/release_1_7/base/


Property changes on: branches/release_1_7
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43902,43946,43954,43960,44363,45161,45201,46146,46983,47034,47776,47782,48230
/trunk/base:45161
   + /trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43902,43946,43954,43960,44363,45161,45201,46052,46146,46983,47034,47776,47782,48230
/trunk/base:45161


Property changes on: branches/release_1_7/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43902,43946,43954,43960,44363,45161,45201,46146,46622-46623,46810,46983,47034,47776,47782,47848,48083,48230
/trunk/base/base:45161,48083
   + /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43902,43946,43954,43960,44363,45161,45201,46052,46146,46622-46623,46810,46983,47034,47776,47782,47848,48083,48230
/trunk/base/base:45161,48083

Modified: branches/release_1_7/base/src/port/port.tcl
===================================================================
--- branches/release_1_7/base/src/port/port.tcl	2009-03-17 08:18:45 UTC (rev 48233)
+++ branches/release_1_7/base/src/port/port.tcl	2009-03-17 08:36:09 UTC (rev 48234)
@@ -1658,6 +1658,10 @@
         return 1
     }
     foreachport $portlist {
+        if {[catch {registry::installed $portname}]} {
+            ui_error "$portname is not installed"
+            return 1
+        }
         # Merge global variations into the variations specified for this port
         foreach { variation value } [array get global_variations] {
             if { ![info exists variations($variation)] } {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090317/7a8fb7af/attachment.html>