[46632] trunk/base/src
perry at macports.org
perry at macports.org
Sun Feb 8 21:04:19 PST 2009
Revision: 46632
http://trac.macports.org/changeset/46632
Author: perry at macports.org
Date: 2009-02-08 21:04:18 -0800 (Sun, 08 Feb 2009)
Log Message:
-----------
base/src - Removed the notes field from PortInfo. (Addresses #421)
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-02-09 04:51:59 UTC (rev 46631)
+++ trunk/base/src/port/port.tcl 2009-02-09 05:04:18 UTC (rev 46632)
@@ -1726,16 +1726,18 @@
break_softcontinue [concat "The URL '$porturl' could not be" \
"opened: $result"] 1 status
}
- array unset portinfo
- array set portinfo [mportinfo $mport]
+ # Return the notes associated with this Portfile.
+ if {[catch {set portnotes [_mportkey $mport portnotes]}]} {
+ set portnotes {}
+ }
mportclose $mport
- # Display notes.
- if {[info exists portinfo(notes)] && $portinfo(notes) ne {}} {
+ # Display the notes.
+ if {$portnotes ne {}} {
puts "$portname has the following notes:"
- # Add indentation.
+ # Indent the output.
puts -nonewline " "
- puts [string map {\n "\n "} $portinfo(notes)]
+ puts [string map {\n "\n "} $portnotes]
} else {
puts "$portname has no notes."
}
Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl 2009-02-09 04:51:59 UTC (rev 46631)
+++ trunk/base/src/port1.0/portutil.tcl 2009-02-09 05:04:18 UTC (rev 46632)
@@ -370,10 +370,9 @@
# Notes are displayed at (1) the end of the activation phase and (2) when
# action_notes is executed.
proc notes {args} {
- global PortInfo portnotes
+ global portnotes
- set PortInfo(notes) [string trim [join $args]]
- set portnotes $PortInfo(notes)
+ set portnotes [string trim [join $args]]
}
# variant <provides> [<provides> ...] [requires <requires> [<requires>]]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090208/ea405f3e/attachment-0001.html>
More information about the macports-changes
mailing list