Changeset 118304

Timestamp:

Mar 29, 2014, 7:21:58 PM (10 years ago)

Author:

cal@…

Message:

base: Delay displaying notes for installed ports until the end of the current operation

Mostly written by Jeremy Lavergne (snc).

Location:

trunk/base/src

Files:

• macports1.0/macports.tcl (modified) (1 diff)
• port/port.tcl (modified) (3 diffs)
• port1.0/portactivate.tcl (modified) (1 diff)

trunk/base/src/macports1.0/macports.tcl

@@ -1295 +1295 @@
     }
 
+    # notifications callback
+    if {[info exists macports::ui_options(notifications_append)]} {
+        $workername alias ui_notifications_append $macports::ui_options(notifications_append)
+    } else {
+        # provide a no-op if notifications_append wasn't set. See http://wiki.tcl.tk/3044
+        $workername alias ui_notifications_append return -level 0
+    }
+
     $workername alias ui_prefix ui_prefix
     $workername alias ui_channels ui_channels

trunk/base/src/port/port.tcl

@@ -4640 +4640 @@
         }
 
+        # Print notifications of just-activated ports.
+        portclient::notifications::display
+
         # semaphore to exit
         if {$action_status == -999} break
@@ -5168 +5171 @@
 }
 
+namespace eval portclient::notifications {
+    ##
+    # Ports whose notifications to display; these were either installed
+    # or requested to be installed.
+    variable notificationsToPrint
+    array set notificationsToPrint {}
+
+    ##
+    # Add a port to the list for printing notifications.
+    #
+    # @param name
+    #        The name of the port.
+    # @param note
+    #        A list of notes to be stored for the given port.
+    proc append {name notes} {
+        variable notificationsToPrint
+
+        set notificationsToPrint($name) $notes
+    }
+
+    ##
+    # Print port notifications.
+    #
+    proc display {} {
+        global env
+        variable notificationsToPrint
+
+        # Display notes at the end of the activation phase.
+        if {[array size notificationsToPrint] > 0} {
+            ui_notice "--->  Some of the ports you installed have notes:"
+            foreach {name notes} [array get notificationsToPrint] {
+                ui_notice "  $name has the following notes:"
+
+                # If env(COLUMNS) exists, limit each line's width to this width.
+                if {[info exists env(COLUMNS)]} {
+                    set maxlen $env(COLUMNS)
+
+                    foreach note $notes {
+                        foreach line [split $note "\n"] {
+                            set joiner ""
+                            set lines ""
+                            set newline "    "
+
+                            foreach word [split $line " "] {
+                                if {[string length $newline] + [string length $word] >= $maxlen} {
+                                    lappend lines $newline
+                                    set newline "    "
+                                    set joiner ""
+                                }
+                                ::append newline $joiner $word
+                                set joiner " "
+                            }
+                            if {$newline ne {}} {
+                                lappend lines $newline
+                            }
+                            ui_notice [join $lines "\n"]
+                        }
+                    }
+                } else {
+                    foreach note $notes {
+                        ui_notice $note
+                    }
+                }
+            }
+        }
+    }
+}
+
 
 ##########################################
@@ -5222 +5293 @@
     set ui_options(progress_generic)  portclient::progress::generic
 }
+
+set ui_options(notifications_append) portclient::notifications::append
 
 # Get arguments remaining after option processing

trunk/base/src/port1.0/portactivate.tcl

@@ -61 +61 @@
 
 proc portactivate::activate_main {args} {
-    global env subport version revision portvariants user_options PortInfo startupitem.autostart UI_PREFIX
+    global subport version revision portvariants user_options PortInfo
 
     registry_activate $subport $version $revision $portvariants [array get user_options]
-
-    # Display notes at the end of the activation phase.
-    if {[info exists PortInfo(notes)] && $PortInfo(notes) ne {}} {
-        ui_notice ""
-        foreach note $PortInfo(notes) {
-            # If env(COLUMNS) exists, limit each line's width to this width.
-            if {[info exists env(COLUMNS)]} {
-                set maxlen $env(COLUMNS)
-
-                foreach line [split $note "\n"] {
-                    set joiner ""
-                    set lines ""
-                    set newline ""
-
-                    foreach word [split $line " "] {
-                        if {[string length $newline] + [string length $word] >= $maxlen} {
-                            lappend lines $newline
-                            set newline ""
-                            set joiner ""
-                        }
-                        append newline $joiner $word
-                        set joiner " "
-                    }
-                    if {$newline ne {}} {
-                        lappend lines $newline
-                    }
-                    ui_notice [join $lines "\n"]
-                }
-            } else {
-                ui_notice $note
-            }
-        }
-        ui_notice ""
+    if {[info exists PortInfo(notes)] && [llength $PortInfo(notes)] > 0} {
+        ui_notifications_append $subport $PortInfo(notes)
     }