[116517] trunk/base/portmgr/packaging

[cal at macports.org]

Revision: 116517
          https://trac.macports.org/changeset/116517
Author:   cal at macports.org
Date:     2014-01-27 07:31:02 -0800 (Mon, 27 Jan 2014)
Log Message:
-----------
portmgr/packaging: Tcl cleanup, patch by Gustaf Neumann, Tcl8.4-clean

Modified Paths:
--------------
    trunk/base/portmgr/packaging/dpkgall.tcl
    trunk/base/portmgr/packaging/mpkgall.tcl
    trunk/base/portmgr/packaging/packageall.tcl
    trunk/base/portmgr/packaging/rpmall.tcl

Modified: trunk/base/portmgr/packaging/dpkgall.tcl
===================================================================
--- trunk/base/portmgr/packaging/dpkgall.tcl	2014-01-27 15:30:01 UTC (rev 116516)
+++ trunk/base/portmgr/packaging/dpkgall.tcl	2014-01-27 15:31:02 UTC (rev 116517)
@@ -106,9 +106,9 @@
 
 proc ui_channels {priority} {
 	global dpkg::logfd
-	if {[info exists logfd] && [string length $logfd] > 0 } {
+	if {[info exists logfd] && $logfd ne ""} {
 		return {$logfd}
-	} elseif {$message(priority) != "debug"} {
+	} elseif {$message(priority) ne "debug"} {
 		# If there's no log file, echo to stdout
 		return {stdout}
 	}
@@ -640,7 +640,7 @@
 	set reqlist ""
 
 	foreach {binary port} $requiredports {
-		if {[find_binary $binary] == ""} {
+		if {[find_binary $binary] eq ""} {
 			lappend reqlist $port
 		}
 	}
@@ -685,7 +685,7 @@
 	set buildlist [lsort -unique $builddeps]
 
 	foreach port $builddeps {
-		if {[lsearch -exact $port $rundeps] >= 0 } {
+		if {[lsearch -exact $port $rundeps] >= 0} {
 			lappend removelist $port
 		}
 	}

Modified: trunk/base/portmgr/packaging/mpkgall.tcl
===================================================================
--- trunk/base/portmgr/packaging/mpkgall.tcl	2014-01-27 15:30:01 UTC (rev 116516)
+++ trunk/base/portmgr/packaging/mpkgall.tcl	2014-01-27 15:31:02 UTC (rev 116517)
@@ -121,7 +121,7 @@
 
 proc write_welcome_html {filename portname portversion long_description description homepage} {
     set fd [open ${filename} w+]
-    if {$long_description == ""} {
+    if {$long_description eq ""} {
 	set long_description $description
     }
 
@@ -137,7 +137,7 @@
 <font face=\"Helvetica\">${long_description}</font>
 <p>"
 
-    if {$homepage != ""} {
+    if {$homepage ne ""} {
 	puts $fd "<font face=\"Helvetica\">${homepage}</font><p>"
     }
 
@@ -157,7 +157,7 @@
 proc mpkg_write_info_plist {infofile portname portversion portrevision destination dependencies} {
 	set vers [split $portversion "."]
 	
-	if {[string index $destination end] != "/"} {
+	if {[string index $destination end] ne "/"} {
 		append destination /
 	}
 	

Modified: trunk/base/portmgr/packaging/packageall.tcl
===================================================================
--- trunk/base/portmgr/packaging/packageall.tcl	2014-01-27 15:30:01 UTC (rev 116516)
+++ trunk/base/portmgr/packaging/packageall.tcl	2014-01-27 15:31:02 UTC (rev 116517)
@@ -46,7 +46,7 @@
 proc ui_isset {val} {
     global ui_options
     if {[info exists ui_options($val)]} {
-	if {$ui_options($val) == "yes"} {
+	if {$ui_options($val) eq "yes"} {
 	    return 1
 	}
     }
@@ -105,7 +105,7 @@
 	
 proc pkg_ui_log {message} {
     global logfd
-    if {[string length $logfd] > 0 } {
+    if {$logfd ne ""} {
 	log_message $logfd $message
     }
 }
@@ -147,13 +147,13 @@
 		set depends {}
 		if {[info exists portinfo(depends_run)]} { eval "lappend depends $portinfo(depends_run)" }
 		if {[info exists portinfo(depends_lib)]} { eval "lappend depends $portinfo(depends_lib)" }
-		if {$includeBuildDeps != "" && [info exists portinfo(depends_build)]} { 
+		if {$includeBuildDeps ne "" && [info exists portinfo(depends_build)]} { 
 			eval "lappend depends $portinfo(depends_build)"
 		}
-		if {$includeBuildDeps != "" && [info exists portinfo(depends_fetch)]} { 
+		if {$includeBuildDeps ne "" && [info exists portinfo(depends_fetch)]} { 
 			eval "lappend depends $portinfo(depends_fetch)"
 		}
-		if {$includeBuildDeps != "" && [info exists portinfo(depends_extract)]} { 
+		if {$includeBuildDeps ne "" && [info exists portinfo(depends_extract)]} { 
 			eval "lappend depends $portinfo(depends_extract)"
 		}
 		
@@ -298,7 +298,7 @@
 	# If there was a log file left over from the previous pass,
 	# then the port failed with an error.  Send the log in an
 	# email to the maintainers.
-	if {[string length $logfd] > 0} {
+	if {$logfd ne ""} {
 		close $logfd
 		set logfd ""
 	}

Modified: trunk/base/portmgr/packaging/rpmall.tcl
===================================================================
--- trunk/base/portmgr/packaging/rpmall.tcl	2014-01-27 15:30:01 UTC (rev 116516)
+++ trunk/base/portmgr/packaging/rpmall.tcl	2014-01-27 15:31:02 UTC (rev 116517)
@@ -47,7 +47,7 @@
 proc ui_isset {val} {
     global ui_options
     if {[info exists ui_options($val)]} {
-	if {$ui_options($val) == "yes"} {
+	if {$ui_options($val) eq "yes"} {
 	    return 1
 	}
     }
@@ -108,7 +108,7 @@
 	
 proc pkg_ui_log {message} {
     global logfd
-    if {[string length $logfd] > 0 } {
+    if {$logfd ne ""} {
 	log_message $logfd $message
     }
 }
@@ -152,13 +152,13 @@
 		set depends {}
 		if {[info exists portinfo(depends_run)]} { eval "lappend depends $portinfo(depends_run)" }
 		if {[info exists portinfo(depends_lib)]} { eval "lappend depends $portinfo(depends_lib)" }
-		if {$includeBuildDeps != "" && [info exists portinfo(depends_build)]} { 
+		if {$includeBuildDeps ne "" && [info exists portinfo(depends_build)]} { 
 			eval "lappend depends $portinfo(depends_build)"
 		}
-		if {$includeBuildDeps != "" && [info exists portinfo(depends_fetch)]} { 
+		if {$includeBuildDeps ne "" && [info exists portinfo(depends_fetch)]} { 
 			eval "lappend depends $portinfo(depends_fetch)"
 		}
-		if {$includeBuildDeps != "" && [info exists portinfo(depends_extract)]} { 
+		if {$includeBuildDeps ne "" && [info exists portinfo(depends_extract)]} { 
 			eval "lappend depends $portinfo(depends_extract)"
 		}
 		foreach depspec $depends {
@@ -360,7 +360,7 @@
 	# If there was a log file left over from the previous pass,
 	# then the port failed with an error.  Send the log in an
 	# email to the maintainers.
-	if {[string length $logfd] > 0} {
+	if {$logfd ne ""} {
 		close $logfd
 		set logfd ""
 	}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140127/266237fa/attachment-0001.html>