[26173] branches/dp2mp-move/base/src/port1.0/portlivecheck.tcl

[source_changes at macosforge.org]

Revision: 26173
          http://trac.macosforge.org/projects/macports/changeset/26173
Author:   jmpp at macports.org
Date:     2007-06-15 00:26:32 -0700 (Fri, 15 Jun 2007)

Log Message:
-----------
Merging eridius' r26041: Fix livecheck to properly de-escape livecheck.url.

Modified Paths:
--------------
    branches/dp2mp-move/base/src/port1.0/portlivecheck.tcl

Modified: branches/dp2mp-move/base/src/port1.0/portlivecheck.tcl
===================================================================
--- branches/dp2mp-move/base/src/port1.0/portlivecheck.tcl	2007-06-15 07:22:45 UTC (rev 26172)
+++ branches/dp2mp-move/base/src/port1.0/portlivecheck.tcl	2007-06-15 07:26:32 UTC (rev 26173)
@@ -128,6 +128,9 @@
 		}
 	}
 	
+	# de-escape livehcheck.url
+	set livecheck.url [join ${livecheck.url}]
+	
 	switch ${livecheck.check} {
 		"regex" -
 		"regexm" {
@@ -139,7 +142,7 @@
 				# let's extract the version from the file.
 				set chan [open $tempfile "r"]
 				set updated -1
-				set the_re [eval "concat ${livecheck.regex}"]
+				set the_re [subst -nocommands [join ${livecheck.regex}]]
 				if {${livecheck.check} == "regexm"} {
 					set data [read $chan]
 					if {[regexp $the_re $data matched updated_version]} {

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070615/55aef60b/attachment.html