[87693] trunk/base/src/port1.0/portchecksum.tcl

[snc at macports.org]

Revision: 87693
          http://trac.macports.org/changeset/87693
Author:   snc at macports.org
Date:     2011-12-01 10:31:57 -0800 (Thu, 01 Dec 2011)
Log Message:
-----------
base: output filenames inline when handling multiple distfiles, #28668

Modified Paths:
--------------
    trunk/base/src/port1.0/portchecksum.tcl

Modified: trunk/base/src/port1.0/portchecksum.tcl
===================================================================
--- trunk/base/src/port1.0/portchecksum.tcl	2011-12-01 18:27:07 UTC (rev 87692)
+++ trunk/base/src/port1.0/portchecksum.tcl	2011-12-01 18:31:57 UTC (rev 87693)
@@ -250,6 +250,12 @@
             if {![info exists checksums_array($distfile)] || [llength $checksums_array($distfile)] < 1} {
                 ui_error "[format [msgcat::mc "No checksum set for %s"] $distfile]"
                 set fail yes
+
+                # no checksums specified; output the default set
+                foreach type $default_checksum_types {
+                    lappend sums [format "%-8s%s" $type [calc_$type $fullpath]]
+                }
+
             } else {
                 # retrieve the list of types/values from the array.
                 set portfile_checksums $checksums_array($distfile)
@@ -286,19 +292,6 @@
     if {[tbool fail]} {
 
         # Show the desired checksum line for easy cut-paste
-        foreach distfile $all_dist_files {
-            set fullpath [file join $distpath $distfile]
-            if {![file isfile $fullpath] && (!$usealtworkpath && [file isfile "${altprefix}${fullpath}"])} {
-                set fullpath "${altprefix}${fullpath}"
-            }
-            if {![info exists checksums_array($distfile)] || [llength $checksums_array($distfile)] < 1} {
-                # no checksums specified; output the default set
-
-                foreach type $default_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" ""]]]
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111201/f56f0eda/attachment.html>