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

[source_changes at macosforge.org]

Revision: 23894
          http://trac.macosforge.org/projects/macports/changeset/23894
Author:   eridius at macports.org
Date:     2007-04-12 06:39:08 -0700 (Thu, 12 Apr 2007)

Log Message:
-----------
A couple more livecheck tweaks.
Allow googlecode homepage detection after master site detection.

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 13:38:18 UTC (rev 23893)
+++ trunk/base/src/port1.0/portlivecheck.tcl	2007-04-12 13:39:08 UTC (rev 23894)
@@ -76,14 +76,17 @@
 				set livecheck.name $tag
 			}
 			set livecheck.check $site
-		} elseif {[regexp {http://code.google.com/p/([^/]+)} $homepage _ tag]} {
-		    set livecheck.check "googlecode"
-		    set livecheck.name $tag
 		} else {
 		    set livecheck.check "freshmeat"
 		}
+		if {[regexp {^http://code.google.com/p/([^/]+)} $homepage _ tag]} {
+		    if {${livecheck.name} eq "default"} {
+		        set livecheck.name $tag
+		    }
+		    set livecheck.check "googlecode"
+		}
 	}
-	if {${livecheck.name} == "default"} {
+	if {${livecheck.name} eq "default"} {
 		set livecheck.name $name
 	}
 
@@ -128,6 +131,7 @@
 		"regex" -
 		"regexm" {
 			# single and multiline regex
+			ui_debug "Fetching ${livecheck.url}"
 			if {[catch {curl fetch ${livecheck.url} $tempfile} error]} {
 				ui_error "cannot check if $portname was updated ($error)"
 			} else {
@@ -170,6 +174,7 @@
 			}
 		}
 		"md5" {
+		    ui_debug "Fetching ${livecheck.url}"
 			if {[catch {curl fetch ${livecheck.url} $tempfile} error]} {
 				ui_error "cannot check if $portname was updated ($error)"
 			} else {

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