[49104] trunk/base/src

[perry at macports.org]

Revision: 49104
          http://trac.macports.org/changeset/49104
Author:   perry at macports.org
Date:     2009-04-03 17:35:06 -0700 (Fri, 03 Apr 2009)
Log Message:
-----------
port/port.tcl, port1.0/portutil.tcl:
Use PortInfo to store notes (instead of using _mportkey) now that PortInfo
keys are limited to those that are searchable [r47874].

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	2009-04-03 23:57:42 UTC (rev 49103)
+++ trunk/base/src/port/port.tcl	2009-04-04 00:35:06 UTC (rev 49104)
@@ -1749,13 +1749,19 @@
             break_softcontinue [concat "The URL '$porturl' could not be" \
                                        "opened: $result"] 1 status
         }
+        array unset portinfo
+        array set portinfo [mportinfo $mport]
+        mportclose $mport
+
         # Return the notes associated with this Portfile.
-        if {[catch {set portnotes [_mportkey $mport portnotes]}]} {
+        if {[info exists portinfo(notes)]} {
+            set portnotes $portinfo(notes)
+        } else {
             set portnotes {}
         }
+
         # Retrieve the port's name once more to ensure it has the proper case.
-        set portname [_mportkey $mport portname]
-        mportclose $mport
+        set portname $portinfo(name)
 
         # Display the notes.
         if {![macports::ui_isset ports_quiet]} {

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2009-04-03 23:57:42 UTC (rev 49103)
+++ trunk/base/src/port1.0/portutil.tcl	2009-04-04 00:35:06 UTC (rev 49104)
@@ -425,9 +425,10 @@
 # Notes are displayed at (1) the end of the activation phase and (2) when
 # action_notes is executed.
 proc notes {args} {
-    global portnotes
+    global PortInfo portnotes
 
-    set portnotes [string trim [join $args]]
+    set PortInfo(notes) [string trim [join $args]]
+    set portnotes $PortInfo(notes)
 }
 
 # variant <provides> [<provides> ...] [requires <requires> [<requires>]]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090403/8135b43a/attachment.html>