[23888] trunk/base/src/port1.0/portlivecheck.tcl

[source_changes at macosforge.org]

Revision: 23888
          http://trac.macosforge.org/projects/macports/changeset/23888
Author:   eridius at macports.org
Date:     2007-04-12 04:54:10 -0700 (Thu, 12 Apr 2007)

Log Message:
-----------
Fix livecheck to check for master_sites properly.
If a portfile isn't set up for livecheck and isn't a sourceforge/freshmeat project, default to none, not freshmeat (which would cause a failure).
Clean up some if checks to avoid unnecessary syntax

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

Modified: trunk/base/src/port1.0/portlivecheck.tcl
===================================================================
--- trunk/base/src/port1.0/portlivecheck.tcl	2007-04-12 11:53:08 UTC (rev 23887)
+++ trunk/base/src/port1.0/portlivecheck.tcl	2007-04-12 11:54:10 UTC (rev 23888)
@@ -60,7 +60,7 @@
 	
 	set updated 0
 	set updated_version "unknown"
-	set has_master_sites [info exists the_master_sites]
+	set has_master_sites [info exists master_sites]
 
 	set tempfile ${workpath}/livecheck.TMP
 	set port_moddate [file mtime ${portpath}/Portfile]
@@ -69,36 +69,34 @@
 	ui_debug "Port (livecheck) version is ${livecheck.version}"
 
 	# Determine the default type depending on the mirror.
-	if {"${livecheck.check}" == "default"} {
-		if {$has_master_sites && [regexp {sourceforge:(.+)} $master_sites dummy tag]} {
-			if {"${livecheck.name}" == "default"} {
+	if {${livecheck.check} == "default"} {
+		if {$has_master_sites && [regexp {\y(sourceforge|freshmeat)\y(?::(\S+))?} $master_sites dummy site tag]} {
+			if {$tag ne "" && ${livecheck.name} eq "default"} {
 				set livecheck.name $tag
 			}
-			set livecheck.check sourceforge
-		} elseif {$has_master_sites && {"$master_sites" == "sourceforge"}} {
-			set livecheck.check sourceforge
+			set livecheck.check $site
 		} else {
-			set livecheck.check freshmeat
+		    set livecheck.check none
 		}
 	}
-	if {"${livecheck.name}" == "default"} {
+	if {${livecheck.name} == "default"} {
 		set livecheck.name $name
 	}
 
 	# Perform the check depending on the type.
-	if {"${livecheck.check}" == "freshmeat"} {
-		if {![info exists homepage] || [string equal "${livecheck.url}" "${homepage}"]} {
+	if {${livecheck.check} == "freshmeat"} {
+		if {![info exists homepage] || ${livecheck.url} eq ${homepage}} {
 			set livecheck.url "http://freshmeat.net/projects-xml/${livecheck.name}/${livecheck.name}.xml"
 		}
-		if {"${livecheck.regex}" == ""} {
+		if {${livecheck.regex} == ""} {
 			set livecheck.regex "<latest_release_version>(.*)</latest_release_version>"
 		}
 		set livecheck.check "regex"
-	} elseif {"${livecheck.check}" == "sourceforge"} {
-		if {![info exists homepage] || [string equal "${livecheck.url}" "${homepage}"]} {
+	} elseif {${livecheck.check} == "sourceforge"} {
+		if {![info exists homepage] || ${livecheck.url} eq ${homepage}} {
 			set livecheck.url "http://sourceforge.net/export/rss2_projfiles.php?project=${livecheck.name}"
 		}
-		if {"${livecheck.regex}" == ""} {
+		if {${livecheck.regex} == ""} {
 			set livecheck.regex "<title>${livecheck.name} (.*) released.*</title>"
 		}
 		set livecheck.check "regex"

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070412/1d110602/attachment.html