Changeset 14667 for trunk/base

Timestamp:

Oct 17, 2005, 12:45:14 AM (19 years ago)

Author:

jberry

Message:

For "port installed foo", make sure we report one way or another whether foo is
installed. If it's not installed, state that. Behavior before this change was
to give no message for a port that was not installed, giving output only
for the installed ports.

This reverts more toward the behavior in 1.1, but I'm not sure it's completely
what we want.

"port installed a b c" might say:

port a is not installed
b 1.2 (active)
c 1.0

"port installed all" would tell you for each port whether it is installed or not.

Feedback welcome. Credit to Juan for reporting this change in behavior.

File:

• trunk/base/src/port/port.tcl (modified) (3 diffs)

trunk/base/src/port/port.tcl

@@ -3 +3 @@
 exec @TCLSH@ "$0" "$@"
 # port.tcl
-# $Id: port.tcl,v 1.135 2005/10/13 04:41:13 jberry Exp $
+# $Id: port.tcl,v 1.136 2005/10/17 00:45:14 jberry Exp $
 #
 # Copyright (c) 2004 Robert Shaw <rshaw@opendarwin.org>
@@ -1401 +1401 @@
         if { [llength $portlist] } {
                         set ilist {}
-                foreach portspec $portlist {
-                        array set port $portspec
-                        set portname $port(name)
-                        set composite_version [composite_version $port(version) $port(variants)]
+                        foreachport $portlist {
+                        set composite_version [composite_version $portversion [array get variations]]
                                 if { [catch {set ilist [concat $ilist [registry::installed $portname $composite_version]]} result] } {
-                                        if {![string match "* not registered as installed." $result]} {
+                                        if {[string match "* not registered as installed." $result]} {
+                                                puts "Port $portname is not installed."
+                                        } else {
                                                 global errorInfo
                                                 ui_debug "$errorInfo"
@@ -1416 +1416 @@
             if { [catch {set ilist [registry::installed]} result] } {
                 if {$result == "Registry error: No ports registered as installed."} {
-                    fatal "No ports installed!"
+                    puts "No ports are installed!"
                 } else {
                                         global errorInfo