[66858] trunk/base/src/macports1.0/macports.tcl

[jmr at macports.org]

Revision: 66858
          http://trac.macports.org/changeset/66858
Author:   jmr at macports.org
Date:     2010-04-23 17:05:56 -0700 (Fri, 23 Apr 2010)
Log Message:
-----------
when running upgrade on a non-outdated port where different variants would be used than are installed, only warn if variants were actually specified on the command line

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2010-04-23 23:50:09 UTC (rev 66857)
+++ trunk/base/src/macports1.0/macports.tcl	2010-04-24 00:05:56 UTC (rev 66858)
@@ -2977,7 +2977,11 @@
             set build_override 1
         } else {
             if {[info exists portinfo(canonical_active_variants)] && $portinfo(canonical_active_variants) != $oldvariant} {
-                ui_warn "Skipping upgrade since $portname ${version_installed}_${revision_installed} >= $portname ${version_in_tree}_${revision_in_tree}, even though installed variants \"$oldvariant\" do not match \"$portinfo(canonical_active_variants)\". Use 'upgrade --enforce-variants' to switch to the requested variants."
+                if {[llength $variationslist] > 0} {
+                    ui_warn "Skipping upgrade since $portname ${version_installed}_${revision_installed} >= $portname ${version_in_tree}_${revision_in_tree}, even though installed variants \"$oldvariant\" do not match \"$portinfo(canonical_active_variants)\". Use 'upgrade --enforce-variants' to switch to the requested variants."
+                } else {
+                    ui_debug "Skipping upgrade since $portname ${version_installed}_${revision_installed} >= $portname ${version_in_tree}_${revision_in_tree}, even though installed variants \"$oldvariant\" do not match \"$portinfo(canonical_active_variants)\"."
+                }
             } else {
                 ui_debug "No need to upgrade! $portname ${version_installed}_${revision_installed} >= $portname ${version_in_tree}_${revision_in_tree}"
             }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100423/de274236/attachment.html>