[133649] trunk/base/src

[jmr at macports.org]

Revision: 133649
          https://trac.macports.org/changeset/133649
Author:   jmr at macports.org
Date:     2015-03-07 16:23:53 -0800 (Sat, 07 Mar 2015)
Log Message:
-----------
remove obsolete PortInfo(variant_desc)

Modified Paths:
--------------
    trunk/base/src/port/port.tcl
    trunk/base/src/port1.0/portutil.tcl

Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl	2015-03-08 00:20:01 UTC (rev 133648)
+++ trunk/base/src/port/port.tcl	2015-03-08 00:23:53 UTC (rev 133649)
@@ -3567,12 +3567,9 @@
             ui_notice "$portname has no variants"
         } else {
             array unset vinfo
-            # Use the new format if it exists.
+            # Use the variant info if it exists.
             if {[info exists portinfo(vinfo)]} {
                 array set vinfo $portinfo(vinfo)
-            # Otherwise fall back to the old format.
-            } elseif {[info exists portinfo(variant_desc)]} {
-                array set vdescriptions $portinfo(variant_desc)
             }
 
             # print out all the variants
@@ -3606,10 +3603,6 @@
                     if {[info exists variant(requires)]} {
                         set vrequires $variant(requires)
                     }
-                # Retrieve variants' information from the old format,
-                # which only consists of the description.
-                } elseif {[info exists vdescriptions($v)]} {
-                    set vdescription $vdescriptions($v)
                 }
 
                 if {[info exists vdescription]} {

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2015-03-08 00:20:01 UTC (rev 133648)
+++ trunk/base/src/port1.0/portutil.tcl	2015-03-08 00:23:53 UTC (rev 133649)
@@ -566,9 +566,7 @@
     # Each key in PortInfo(vinfo) maps to an array which contains the
     # following keys:
     #   * conflicts
-    #   * description: This key's mapping is duplicated in
-    #                  PortInfo(variant_desc) for backward compatibility
-    #                  reasons (specifically 1.7.0's format of PortIndex).
+    #   * description
     #   * is_default: This key exists iff the variant is a default variant.
     #   * requires
     if {![info exists PortInfo(vinfo)]} {
@@ -636,9 +634,6 @@
         # Set description.
         if {$vdesc ne ""} {
             array set variant [list description $vdesc]
-            # XXX: The following line should be removed after 1.8.0 is
-            #      released.
-            lappend PortInfo(variant_desc) $variant_provides $vdesc
         }
 
         # Set requires.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150307/f3dea555/attachment.html>