<!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>[152663] branches/release_2_3/base</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/152663">152663</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2016-09-14 06:59:54 -0700 (Wed, 14 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>merge <a href="https://trac.macports.org/changeset/127797">r127797</a> from trunk:
generate an error when livecheck finds an older version than is currently in the portfile, instead of saying that the older version is newer (#17041)
merge <a href="https://trac.macports.org/changeset/149299">r149299</a> from trunk:
livecheck: report error if matched version is old
Applying the same message to 'livecheck.type regexm' that was already
introduced for 'regex' in <a href="https://trac.macports.org/changeset/127797">r127797</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesrelease_2_3basesrcport10portlivechecktcl">branches/release_2_3/base/src/port1.0/portlivecheck.tcl</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branchesrelease_2_3base">branches/release_2_3/base/</a></li>
<li><a href="#branchesrelease_2_3basesrc">branches/release_2_3/base/src/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesrelease_2_3base"></a>
<div class="propset"><h4>Property changes: branches/release_2_3/base</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/branches/gsoc09-logging/base:51231-60371
</span><span class="cx">/branches/gsoc11-rev-upgrade/base:78828-88375
</span><span class="cx">/branches/gsoc11-statistics/base:79520,79666
</span><span class="cx">/branches/gsoc13-tests:106692-111324
</span><span class="cx">/branches/universal-sanity/base:51872-52323
</span><span class="cx">/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
</span><span class="cx">/trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,136965,137850,138461,138530,138749,139270,140693,140724,141134,141412,145037,145162,146644,147347,147456,148084,149529,150305,152447
</span><span class="cx">/users/perry/base-bugs_and_notes:45682-46060
</span><span class="cx">/users/perry/base-select:44044-44692
</span><span class="cx"> + /branches/gsoc08-privileges/base:37343-46937
</span><span class="cx">/branches/gsoc09-logging/base:51231-60371
</span><span class="cx">/branches/gsoc11-rev-upgrade/base:78828-88375
</span><span class="cx">/branches/gsoc11-statistics/base:79520,79666
</span><span class="cx">/branches/gsoc13-tests:106692-111324
</span><span class="cx">/branches/universal-sanity/base:51872-52323
</span><span class="cx">/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
</span><span class="cx">/trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,127797,128113,128274,128276,128422,134501-134502,134511,136965,137850,138461,138530,138749,139270,140693,140724,141134,141412,145037,145162,146644,147347,147456,148084,149299,149529,150305,152447
</span><span class="cx">/users/perry/base-bugs_and_notes:45682-46060
</span><span class="cx">/users/perry/base-select:44044-44692
</span><a id="branchesrelease_2_3basesrc"></a>
<div class="propset"><h4>Property changes: branches/release_2_3/base/src</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/branches/gsoc09-logging/base/src:51231-60371
</span><span class="cx">/branches/gsoc11-rev-upgrade/base/src:78828-88375
</span><span class="cx">/branches/gsoc11-statistics/base/src:79520,79666
</span><span class="cx">/branches/gsoc13-tests/src:106692-111324
</span><span class="cx">/branches/universal-sanity/base/src:51872-52323
</span><span class="cx">/branches/variant-descs-14482/base/src:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
</span><span class="cx">/trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,135851,136965,137850,138461,138530,138749,139270,141134,141412,145037,145162,146644,147347,147456,148084,150305,152447
</span><span class="cx">/users/perry/base-bugs_and_notes/src:45682-46060
</span><span class="cx">/users/perry/base-select/src:44044-44692
</span><span class="cx"> + /branches/gsoc08-privileges/base/src:37343-46937
</span><span class="cx">/branches/gsoc09-logging/base/src:51231-60371
</span><span class="cx">/branches/gsoc11-rev-upgrade/base/src:78828-88375
</span><span class="cx">/branches/gsoc11-statistics/base/src:79520,79666
</span><span class="cx">/branches/gsoc13-tests/src:106692-111324
</span><span class="cx">/branches/universal-sanity/base/src:51872-52323
</span><span class="cx">/branches/variant-descs-14482/base/src:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
</span><span class="cx">/trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,127797,128113,128274,128276,128422,134501-134502,134511,135851,136965,137850,138461,138530,138749,139270,141134,141412,145037,145162,146644,147347,147456,148084,149299,150305,152447
</span><span class="cx">/users/perry/base-bugs_and_notes/src:45682-46060
</span><span class="cx">/users/perry/base-select/src:44044-44692
</span><a id="branchesrelease_2_3basesrcport10portlivechecktcl"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/src/port1.0/portlivecheck.tcl (152662 => 152663)</h4>
<pre class="diff"><span>
<span class="info">--- branches/release_2_3/base/src/port1.0/portlivecheck.tcl 2016-09-14 13:50:58 UTC (rev 152662)
+++ branches/release_2_3/base/src/port1.0/portlivecheck.tcl 2016-09-14 13:59:54 UTC (rev 152663)
</span><span class="lines">@@ -144,28 +144,32 @@
</span><span class="cx"> "regexm" {
</span><span class="cx"> # single and multiline regex
</span><span class="cx"> ui_debug "Fetching ${livecheck.url}"
</span><del>- if {[catch {eval curl fetch $curl_options {${livecheck.url}} $tempfile} error]} {
</del><ins>+ set updated -1
+ if {[catch {curl fetch {*}$curl_options ${livecheck.url} $tempfile} error]} {
</ins><span class="cx"> ui_error "cannot check if $subport was updated ($error)"
</span><del>- set updated -1
</del><span class="cx"> } else {
</span><span class="cx"> # let's extract the version from the file.
</span><span class="cx"> set chan [open $tempfile "r"]
</span><del>- set updated -1
</del><ins>+ set foundmatch 0
</ins><span class="cx"> set the_re [join ${livecheck.regex}]
</span><span class="cx"> ui_debug "The regex is \"$the_re\""
</span><del>- if {${livecheck.type} == "regexm"} {
</del><ins>+ if {${livecheck.type} eq "regexm"} {
</ins><span class="cx"> set data [read $chan]
</span><span class="cx"> if {[regexp $the_re $data matched updated_version]} {
</span><del>- if {$updated_version != ${livecheck.version}} {
- set updated 1
</del><ins>+ set foundmatch 1
+ ui_debug "The regex matched \"$matched\", extracted \"$updated_version\""
+ if {$updated_version ne ${livecheck.version}} {
+ if {[vercmp $updated_version ${livecheck.version}] > 0} {
+ set updated 1
+ } else {
+ ui_error "livecheck failed for ${subport}: extracted version '$updated_version' is older than livecheck.version '${livecheck.version}'"
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> set updated 0
</span><span class="cx"> }
</span><del>- ui_debug "The regex matched \"$matched\", extracted \"$updated_version\""
</del><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> set updated_version 0
</span><del>- set foundmatch 0
</del><span class="cx"> while {[gets $chan line] >= 0} {
</span><span class="cx"> set lastoff 0
</span><span class="cx"> while {[regexp -start $lastoff -indices $the_re $line offsets]} {
</span><span class="lines">@@ -179,17 +183,19 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if {$foundmatch == 1} {
</span><del>- if {$updated_version == 0} {
- set updated -1
- } elseif {$updated_version != ${livecheck.version}} {
- set updated 1
</del><ins>+ if {$updated_version ne ${livecheck.version}} {
+ if {[vercmp $updated_version ${livecheck.version}] > 0} {
+ set updated 1
+ } else {
+ ui_error "livecheck failed for ${subport}: extracted version '$updated_version' is older than livecheck.version '${livecheck.version}'"
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> set updated 0
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> close $chan
</span><del>- if {$updated < 0} {
</del><ins>+ if {!$foundmatch} {
</ins><span class="cx"> ui_error "cannot check if $subport was updated (regex didn't match)"
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -202,7 +208,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> # let's compute the md5 sum.
</span><span class="cx"> set dist_md5 [md5 file $tempfile]
</span><del>- if {$dist_md5 != ${livecheck.md5}} {
</del><ins>+ if {$dist_md5 ne ${livecheck.md5}} {
</ins><span class="cx"> ui_debug "md5sum for ${livecheck.url}: $dist_md5"
</span><span class="cx"> set updated 1
</span><span class="cx"> }
</span><span class="lines">@@ -229,7 +235,7 @@
</span><span class="cx">
</span><span class="cx"> file delete -force $tempfile
</span><span class="cx">
</span><del>- if {${livecheck.type} != "none"} {
</del><ins>+ if {${livecheck.type} ne "none"} {
</ins><span class="cx"> if {$updated > 0} {
</span><span class="cx"> ui_msg "$subport seems to have been updated (port version: ${livecheck.version}, new version: $updated_version)"
</span><span class="cx"> } elseif {$updated == 0} {
</span></span></pre>
</div>
</div>
</body>
</html>