Changeset 81465

Timestamp:

07/31/11 02:42:32 (4 years ago)

Author:

jmr@…

Message:

merge r81464 from trunk:

add progress output to images_to_archives.tcl (#30347)

Location:

branches/release_2_0

Files:

• . (modified) (1 prop)
• base (modified) (1 prop)
• base/portmgr/fedora/macports.spec (modified) (1 prop)
• base/src/images_to_archives.tcl (modified) (4 diffs)
• base/src/pextlib1.0/sha2.c (modified) (1 prop)
• base/src/pextlib1.0/sha2.h (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.c (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.h (modified) (1 prop)
• base/src/registry2.0/receipt_sqlite.tcl (modified) (1 prop)

branches/release_2_0/base/src/images_to_archives.tcl

@@ -34 +34 @@
 # the registry only after we know all creation attempts were successful.
 set archived_list {}
+set installed_len [llength $ilist]
+set counter 0
 
 foreach installed $ilist {
+    incr counter
     set iname [lindex $installed 0]
     set iversion [lindex $installed 1]
@@ -85 +88 @@
         # compute new name and location of archive
         set archivename "${iname}-${iversion}_${irevision}${ivariants}.${macports::os_platform}_${macports::os_major}.[join $archs -].${archivetype}"
+        ui_msg "Processing ${counter} of ${installed_len}: ${archivename}"
         if {$installtype == "image"} {
             set targetdir [file dirname $location]
@@ -116 +120 @@
 }
 
+set archived_len [llength $archived_list]
+set counter 0
+
 registry::write {
     foreach archived $archived_list {
+        incr counter
+        ui_msg "Updating registry: ${counter} of ${archived_len}"
         set installtype [lindex $archived 0]
         set iref [lindex $archived 1]
@@ -135 +144 @@
 }
 
+set counter 0
 foreach archived $archived_list {
+    incr counter
     set location [lindex $archived 2]
+    ui_msg "Deleting ${counter} of ${archived_len}: ${location}"
     if {$location != "" && [file isdirectory $location]} {
         if {[catch {file delete -force $location} result]} {