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

[snc at macports.org]

Revision: 87688
          http://trac.macports.org/changeset/87688
Author:   snc at macports.org
Date:     2011-12-01 10:18:38 -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 17:29:15 UTC (rev 87687)
+++ trunk/base/src/port1.0/portchecksum.tcl	2011-12-01 18:18:38 UTC (rev 87688)
@@ -242,6 +242,10 @@
                 }
             }
 
+            if {[llength $all_dist_files] > 1} {
+                lappend sums $distfile
+            }
+
             # check that there is at least one checksum for the distfile.
             if {![info exists checksums_array($distfile)] || [llength $checksums_array($distfile)] < 1} {
                 ui_error "[format [msgcat::mc "No checksum set for %s"] $distfile]"
@@ -283,16 +287,17 @@
 
         # Show the desired checksum line for easy cut-paste
         foreach distfile $all_dist_files {
-            if {[llength $all_dist_files] > 1} {
-                lappend sums $distfile
-            }
-
             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
+
+                if {[llength $all_dist_files] > 1} {
+                    lappend sums $distfile
+                }
+
                 foreach type $default_checksum_types {
                     lappend sums [format "%-8s%s" $type [calc_$type $fullpath]]
                 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111201/bd6d93b6/attachment.html>