Changeset 32441

Timestamp:

01/01/08 09:09:21 (11 months ago)

Author:

jberry@…

Message:

If checksum is mismatched, and in verbose mode, present a corrected pre-fabricated
checksum statement to make it easy to update a port.

Files:

• trunk/base/src/port1.0/portchecksum.tcl (modified) (4 diffs)

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

@@ -185 +185 @@
 #
 proc checksum_main {args} {
-        global UI_PREFIX all_dist_files checksums_array portverbose checksum.skip
+        global UI_PREFIX all_dist_files checksum_types checksums_array portverbose checksum.skip
 
         # If no files have been downloaded, there is nothing to checksum.
@@ -219 +219 @@
                         if {![info exists checksums_array($distfile)]} {
                                 ui_error "[format [msgcat::mc "No checksum set for %s"] $distfile]"
-                                ui_info "[format [msgcat::mc "Distfile checksum: %s md5 %s"] $distfile [calc_md5 $fullpath]]"
-                                ui_info "[format [msgcat::mc "Distfile checksum: %s sha1 %s"] $distfile [calc_sha1 $fullpath]]"
-                                ui_info "[format [msgcat::mc "Distfile checksum: %s rmd160 %s"] $distfile [calc_rmd160 $fullpath]]"
+                                foreach type $checksum_types {
+                                        ui_info "[format [msgcat::mc "Distfile checksum: %s $type %s"] $distfile [calc_$type $fullpath]]"
+                                }
                                 set fail yes
                         } else {
@@ -242 +242 @@
                                 }
                         }
+                        
                 }
         } else {
@@ -249 +250 @@
 
         if {[tbool fail]} {
+        
+                # Show the desired checksum line for easy cut-paste
+                set sums ""
+                foreach distfile $all_dist_files {
+                        if {[llength $all_dist_files] > 1} {
+                                lappend sums $distfile
+                        }
+                        
+                        set fullpath [file join $distpath $distfile]
+                        foreach type $checksum_types {
+                                lappend sums [format "%-8s%s" $type [calc_$type $fullpath]]
+                        }
+                }
+                ui_info "The correct checksum line may be:"
+                ui_info [format "%-20s%s" "checksums" [join $sums [format " \\\n%-20s" ""]]]
+                
                 return -code error "[msgcat::mc "Unable to verify file checksums"]"
         }