<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[142074] trunk/base/src/port1.0/portchecksum.tcl</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/142074">142074</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-11-02 23:41:54 -0800 (Mon, 02 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update checksum suggestion to include the union of Portfile types and default types</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcport10portchecksumtcl">trunk/base/src/port1.0/portchecksum.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcport10portchecksumtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portchecksum.tcl (142073 => 142074)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portchecksum.tcl 2015-11-03 04:20:20 UTC (rev 142073)
+++ trunk/base/src/port1.0/portchecksum.tcl 2015-11-03 07:41:54 UTC (rev 142074)
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> set checksums_str [option checksums]
</span><span class="cx">
</span><span class="cx"> # store the calculated checksums to avoid repeated calculations
</span><del>- set sums ""
</del><ins>+ array set calculated_checksums_array {}
</ins><span class="cx">
</span><span class="cx"> # if everything is fine with the syntax, keep on and check the checksum of
</span><span class="cx"> # the distfiles.
</span><span class="lines">@@ -251,28 +251,20 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if {[llength $all_dist_files] > 1} {
- lappend sums $distfile
- }
-
</del><span class="cx"> # check that there is at least one checksum for the distfile.
</span><span class="cx"> if {![info exists checksums_array($distfile)] || [llength $checksums_array($distfile)] < 1} {
</span><span class="cx"> ui_error "[format [msgcat::mc "No checksum set for %s"] $distfile]"
</span><span class="cx"> set fail yes
</span><del>-
- # no checksums specified; output the default set
- foreach type $default_checksum_types {
- lappend sums [format "%-8s%s" $type [calc_$type $fullpath]]
- }
-
</del><span class="cx"> } else {
</span><span class="cx"> # retrieve the list of types/values from the array.
</span><span class="cx"> set portfile_checksums $checksums_array($distfile)
</span><ins>+ set calculated_checksums {}
</ins><span class="cx">
</span><span class="cx"> # iterate on this list to check the actual values.
</span><span class="cx"> foreach {type sum} $portfile_checksums {
</span><span class="cx"> set calculated_sum [calc_$type $fullpath]
</span><del>- lappend sums [format "%-8s%s" $type $calculated_sum]
</del><ins>+ lappend calculated_checksums $type
+ lappend calculated_checksums $calculated_sum
</ins><span class="cx">
</span><span class="cx"> # Used for regression testing
</span><span class="cx"> ui_debug "[format [msgcat::mc "Calculated (%s) is %s"] $type $calculated_sum]"
</span><span class="lines">@@ -288,6 +280,10 @@
</span><span class="cx"> set fail yes
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ # Save our calculated checksums in case we need them later
+ set calculated_checksums_array($distfile) $calculated_checksums
+
</ins><span class="cx"> if {[tbool fail] && ![regexp {\.html?$} ${distfile}] &&
</span><span class="cx"> ![catch {strsed [exec [findBinary file $portutil::autoconf::file_path] $fullpath --brief --mime] {s/;.*$//}} mimetype]
</span><span class="cx"> && "text/html" == $mimetype} {
</span><span class="lines">@@ -319,31 +315,51 @@
</span><span class="cx"> ui_notice "The file has been moved to: $htmlfile_path"
</span><span class="cx"> } else {
</span><span class="cx"> # Show the desired checksum line for easy cut-paste
</span><del>- ui_info "The correct checksum line may be:"
- #ui_info [format "%-20s%s" "checksums" [join $sums [format " \\\n%-20s" ""]]]
</del><ins>+ # based on the previously calculated values, plus our default types
+ set sums {}
</ins><span class="cx">
</span><del>- set default_sums {}
</del><span class="cx"> foreach distfile $all_dist_files {
</span><span class="cx"> if {[llength $all_dist_files] > 1} {
</span><del>- lappend default_sums $distfile
</del><ins>+ lappend sums $distfile
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- # get the full path of the distfile.
- set fullpath [file join $distpath $distfile]
- if {![file isfile $fullpath]} {
- if {!$usealtworkpath && [file isfile "${altprefix}${fullpath}"]} {
- set fullpath "${altprefix}${fullpath}"
- } else {
- return -code error "$distfile does not exist in $distpath"
</del><ins>+ set missing_types $default_checksum_types
+
+ # Append the string for the calculated types and note any of
+ # our default types that were already calculated
+ if {[info exists calculated_checksums_array($distfile)] && [llength $calculated_checksums_array($distfile)]} {
+ set calculated_checksums $calculated_checksums_array($distfile)
+ foreach {type sum} $calculated_checksums {
+ lappend sums [format "%-8s%s" $type $sum]
+
+ set found [lsearch -exact ${missing_types} ${type}];
+ if { ${found} != -1} {
+ set missing_types [lreplace ${missing_types} ${found} ${found}]
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- foreach type $default_checksum_types {
- lappend default_sums [format "%-8s%s" $type [calc_$type $fullpath]]
</del><ins>+ # Append the string for any of our default types that were
+ # note previously calculated
+ if {[llength $missing_types]} {
+ # get the full path of the distfile.
+ set fullpath [file join $distpath $distfile]
+ if {![file isfile $fullpath]} {
+ if {!$usealtworkpath && [file isfile "${altprefix}${fullpath}"]} {
+ set fullpath "${altprefix}${fullpath}"
+ } else {
+ return -code error "$distfile does not exist in $distpath"
+ }
+ }
+
+ foreach type $missing_types {
+ lappend sums [format "%-8s%s" $type [calc_$type $fullpath]]
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ui_info [format "%-20s%s" "checksums" [join $default_sums [format " \\\n%-20s" ""]]]
</del><ins>+ ui_info "The correct checksum line may be:"
+ ui_info [format "%-20s%s" "checksums" [join $sums [format " \\\n%-20s" ""]]]
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return -code error "[msgcat::mc "Unable to verify file checksums"]"
</span></span></pre>
</div>
</div>
</body>
</html>