<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[116443] trunk/base/src/images_to_archives.tcl</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/116443">116443</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-01-25 08:43:11 -0800 (Sat, 25 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>images_to_archives.tcl: use string comparisons where strings are compared, part of a patch from Gustaf Neumann
See this thread https://lists.macosforge.org/pipermail/macports-dev/2013-July/023224.html</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcimages_to_archivestcl">trunk/base/src/images_to_archives.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcimages_to_archivestcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/images_to_archives.tcl (116442 => 116443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/images_to_archives.tcl 2014-01-25 15:30:31 UTC (rev 116442)
+++ trunk/base/src/images_to_archives.tcl 2014-01-25 16:43:11 UTC (rev 116443)
</span><span class="lines">@@ -45,19 +45,19 @@
</span><span class="cx"> set iepoch [lindex $installed 5]
</span><span class="cx"> set iref [registry::open_entry $iname $iversion $irevision $ivariants $iepoch]
</span><span class="cx"> set installtype [registry::property_retrieve $iref installtype]
</span><del>- if {$installtype == "image"} {
</del><ins>+ if {$installtype eq "image"} {
</ins><span class="cx"> set location [registry::property_retrieve $iref location]
</span><del>- if {$location == "0"} {
</del><ins>+ if {$location == 0} {
</ins><span class="cx"> set location [registry::property_retrieve $iref imagedir]
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> set location ""
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if {$location == "" || ![file isfile $location]} {
</del><ins>+ if {$location eq "" || ![file isfile $location]} {
</ins><span class="cx"> # no image archive present, so make one
</span><span class="cx"> set archs [registry::property_retrieve $iref archs]
</span><del>- if {$archs == "" || $archs == "0"} {
</del><ins>+ if {$archs eq "" || $archs == 0} {
</ins><span class="cx"> set archs ${macports::os_arch}
</span><span class="cx"> }
</span><span class="cx"> # look for any existing archive in the old location
</span><span class="lines">@@ -88,12 +88,12 @@
</span><span class="cx"> # compute new name and location of archive
</span><span class="cx"> set archivename "${iname}-${iversion}_${irevision}${ivariants}.${macports::os_platform}_${macports::os_major}.[join $archs -].${archivetype}"
</span><span class="cx"> ui_msg "Processing ${counter} of ${installed_len}: ${archivename}"
</span><del>- if {$installtype == "image"} {
</del><ins>+ if {$installtype eq "image"} {
</ins><span class="cx"> set targetdir [file dirname $location]
</span><span class="cx"> } else {
</span><span class="cx"> set targetdir [file join ${macports::registry.path} software ${iname}]
</span><span class="cx"> }
</span><del>- if {$location == "" || ![file isdirectory $location]} {
</del><ins>+ if {$location eq "" || ![file isdirectory $location]} {
</ins><span class="cx"> set contents [$iref imagefiles]
</span><span class="cx"> }
</span><span class="cx"> file mkdir $targetdir
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx">
</span><span class="cx"> if {$found} {
</span><span class="cx"> file rename $oldarchivefullpath $newlocation
</span><del>- } elseif {$installtype == "image" && [file isdirectory $location]} {
</del><ins>+ } elseif {$installtype eq "image" && [file isdirectory $location]} {
</ins><span class="cx"> # create archive from image dir
</span><span class="cx"> system -W $location "$tarcmd -cjf $newlocation * > ${targetdir}/error.log 2>&1"
</span><span class="cx"> file delete -force ${targetdir}/error.log
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> set iref [lindex $archived 1]
</span><span class="cx"> set newlocation [lindex $archived 3]
</span><span class="cx">
</span><del>- if {$installtype == "direct"} {
</del><ins>+ if {$installtype eq "direct"} {
</ins><span class="cx"> # change receipt to image
</span><span class="cx"> $iref installtype image
</span><span class="cx"> $iref state imaged
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> incr counter
</span><span class="cx"> set location [lindex $archived 2]
</span><span class="cx"> ui_msg "Deleting ${counter} of ${archived_len}: ${location}"
</span><del>- if {$location != "" && [file isdirectory $location]} {
</del><ins>+ if {$location ne "" && [file isdirectory $location]} {
</ins><span class="cx"> if {[catch {file delete -force $location} result]} {
</span><span class="cx"> ui_warn "Failed to delete ${location}: $result"
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>