Changeset 127797

Timestamp:

Nov 4, 2014, 12:01:46 PM (9 years ago)

Author:

jmr@…

Message:

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)

File:

• trunk/base/src/port1.0/portlivecheck.tcl (modified) (6 diffs)

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

@@ -150 +150 @@
             # single and multiline regex
             ui_debug "Fetching ${livecheck.url}"
+            set updated -1
             if {[catch {curl fetch {*}$curl_options ${livecheck.url} $tempfile} error]} {
                 ui_error "cannot check if $subport was updated ($error)"
-                set updated -1
             } else {
                 # let's extract the version from the file.
                 set chan [open $tempfile "r"]
-                set updated -1
+                set foundmatch 0
                 set the_re [join ${livecheck.regex}]
                 ui_debug "The regex is \"$the_re\""
-                if {${livecheck.type} == "regexm"} {
+                if {${livecheck.type} eq "regexm"} {
                     set data [read $chan]
                     if {[regexp $the_re $data matched updated_version]} {
-                        if {$updated_version != ${livecheck.version}} {
+                        set foundmatch 1
+                        if {$updated_version ne ${livecheck.version}} {
                             set updated 1
                         } else {
@@ -171 +172 @@
                 } else {
                     set updated_version 0
-                    set foundmatch 0
                     while {[gets $chan line] >= 0} {
                         set lastoff 0
@@ -185 +185 @@
                     }
                     if {$foundmatch == 1} {
-                        if {$updated_version == 0} {
-                            set updated -1
-                        } elseif {$updated_version != ${livecheck.version}} {
-                            set updated 1
+                        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}'"
+                            }
                         } else {
                             set updated 0
@@ -195 +197 @@
                 }
                 close $chan
-                if {$updated < 0} {
+                if {!$foundmatch} {
                     ui_error "cannot check if $subport was updated (regex didn't match)"
                 }
@@ -208 +210 @@
                 # let's compute the md5 sum.
                 set dist_md5 [md5 file $tempfile]
-                if {$dist_md5 != ${livecheck.md5}} {
+                if {$dist_md5 ne ${livecheck.md5}} {
                     ui_debug "md5sum for ${livecheck.url}: $dist_md5"
                     set updated 1
@@ -234 +236 @@
     file delete -force $tempfile
 
-    if {${livecheck.type} != "none"} {
+    if {${livecheck.type} ne "none"} {
         if {$updated > 0} {
             ui_msg "$subport seems to have been updated (port version: ${livecheck.version}, new version: $updated_version)"