[101267] branches/release_2_1

jmr at macports.org jmr at macports.org
Mon Jan 7 06:08:21 PST 2013 

Revision: 101267
          https://trac.macports.org/changeset/101267
Author:   jmr at macports.org
Date:     2013-01-07 06:08:21 -0800 (Mon, 07 Jan 2013)
Log Message:
-----------
merge r99857 from trunk:
 Do not display ticket report URL on upgrade if the reason for the failure was that the port was not already installed or that the given port name was invalid.

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

Modified Paths:
--------------
    branches/release_2_1/base/src/macports1.0/macports.tcl
    branches/release_2_1/base/src/port/port.tcl

Property Changed:
----------------
    branches/release_2_1/
    branches/release_2_1/base/
    branches/release_2_1/base/src/macports1.0/


Property changes on: branches/release_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93153,93197,93250,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96262,96535,97264,97367,97999,98190,98313,99275,99754,99822
   + /trunk:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93153,93197,93250,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96262,96535,97264,97367,97999,98190,98313,99275,99754,99822,99857


Property changes on: branches/release_2_1/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:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,98190,98313,99275,99754,99822,100129,100217-100220
/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:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,98190,98313,99275,99754,99822,99857,100129,100217-100220
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692


Property changes on: branches/release_2_1/base/src/macports1.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base/src/macports1.0:37343-46937
/branches/gsoc09-logging/base/src/macports1.0:51231-60371
/branches/gsoc11-rev-upgrade/base/src/macports1.0:78828-88375
/branches/universal-sanity/base/src/macports1.0:51872-52323
/branches/variant-descs-14482/base/src/macports1.0:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/macports1.0:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93221,93816,93962,95552,100129,100217-100219
/users/perry/base-bugs_and_notes/src/macports1.0:45682-46060
/users/perry/base-select/src/macports1.0:44044-44692
   + /branches/gsoc08-privileges/base/src/macports1.0:37343-46937
/branches/gsoc09-logging/base/src/macports1.0:51231-60371
/branches/gsoc11-rev-upgrade/base/src/macports1.0:78828-88375
/branches/universal-sanity/base/src/macports1.0:51872-52323
/branches/variant-descs-14482/base/src/macports1.0:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/macports1.0:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93221,93816,93962,95552,99857,100129,100217-100219
/users/perry/base-bugs_and_notes/src/macports1.0:45682-46060
/users/perry/base-select/src/macports1.0:44044-44692

Modified: branches/release_2_1/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_2_1/base/src/macports1.0/macports.tcl	2013-01-07 14:04:54 UTC (rev 101266)
+++ branches/release_2_1/base/src/macports1.0/macports.tcl	2013-01-07 14:08:21 UTC (rev 101267)
@@ -3374,12 +3374,16 @@
 }
 
 # upgrade API wrapper procedure
-# return codes: 0 = success, 1 = general failure, 2 = port name not found in index
+# return codes:
+#   0 = success
+#   1 = general failure
+#   2 = port name not found in index
+#   3 = port not installed
 proc macports::upgrade {portname dspec variationslist optionslist {depscachename ""}} {
     # only installed ports can be upgraded
     if {![registry::entry_exists_for_name $portname]} {
         ui_error "$portname is not installed"
-        return 1
+        return 3
     }
     if {![string match "" $depscachename]} {
         upvar $depscachename depscache

Modified: branches/release_2_1/base/src/port/port.tcl
===================================================================
--- branches/release_2_1/base/src/port/port.tcl	2013-01-07 14:04:54 UTC (rev 101266)
+++ branches/release_2_1/base/src/port/port.tcl	2013-01-07 14:08:21 UTC (rev 101267)
@@ -2593,16 +2593,17 @@
     foreachport $portlist {
         if {![info exists depscache(port:$portname)]} {
             set status [macports::upgrade $portname "port:$portname" [array get requested_variations] [array get options] depscache]
-            # status 2 means the port was not found in the index
-            if {$status != 0 && $status != 2 && ![macports::ui_isset ports_processall]} {
+            # status 2 means the port was not found in the index,
+            # status 3 means the port is not installed
+            if {$status != 0 && $status != 2 && $status != 3 && ![macports::ui_isset ports_processall]} {
                 break
             }
         }
     }
     
-    if {$status != 0} {
+    if {$status != 0 && $status != 2 && $status != 3} {
         print_tickets_url
-    } else {
+    } elseif {$status == 0} {
         array set options $opts
         if {![info exists options(ports_upgrade_no-rev-upgrade)] && ${macports::revupgrade_autorun} && ![macports::global_option_isset ports_dryrun]} {
             set status [action_revupgrade $action $portlist $opts]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130107/50591e56/attachment.html>

More information about the macports-changes mailing list