<!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>[136510] trunk/base/src/macports1.0/macports.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/136510">136510</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2015-05-19 19:06:20 -0700 (Tue, 19 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>use correct path when extracting portfile from a local binary archive</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcmacports10macportstcl">trunk/base/src/macports1.0/macports.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcmacports10macportstcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/macports.tcl (136509 => 136510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/macports.tcl 2015-05-20 01:48:06 UTC (rev 136509)
+++ trunk/base/src/macports1.0/macports.tcl 2015-05-20 02:06:20 UTC (rev 136510)
</span><span class="lines">@@ -1499,7 +1499,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {$local} {
</span><del>- set fetchfile $url
</del><ins>+ set filepath $url
</ins><span class="cx"> } else {
</span><span class="cx"> ui_msg "$macports::ui_prefix Fetching port $url"
</span><span class="cx"> set fetchfile [file tail $url]
</span><span class="lines">@@ -1509,7 +1509,8 @@
</span><span class="cx"> } elseif {[info exists macports::ui_options(progress_download)]} {
</span><span class="cx"> set progressflag "--progress ${macports::ui_options(progress_download)}"
</span><span class="cx"> }
</span><del>- if {[catch {curl fetch {*}$progressflag $url [file join $fetchdir $fetchfile]} result]} {
</del><ins>+ set filepath [file join $fetchdir $fetchfile]
+ if {[catch {curl fetch {*}$progressflag $url $filepath} result]} {
</ins><span class="cx"> return -code error "Port remote fetch failed: $result"
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1520,9 +1521,9 @@
</span><span class="cx"> # check if this is a binary archive or just the port dir by checking
</span><span class="cx"> # whether the file "+CONTENTS" exists.
</span><span class="cx"> set tarcmd [findBinary tar $macports::autoconf::tar_path]
</span><del>- set tarflags [get_tar_flags [file extension $fetchfile]]
</del><ins>+ set tarflags [get_tar_flags [file extension $filepath]]
</ins><span class="cx"> set qflag $macports::autoconf::tar_q
</span><del>- set cmdline [list $tarcmd ${tarflags}${qflag}xOf $fetchfile +CONTENTS]
</del><ins>+ set cmdline [list $tarcmd ${tarflags}${qflag}xOf $filepath +CONTENTS]
</ins><span class="cx"> ui_debug $cmdline
</span><span class="cx"> if {![catch {set contents [exec {*}$cmdline]}]} {
</span><span class="cx"> # the file is probably a valid binary archive
</span><span class="lines">@@ -1550,9 +1551,9 @@
</span><span class="cx"> # extract the portfile (and possibly files dir if not a binary archive)
</span><span class="cx"> ui_debug "extracting port archive to [pwd]"
</span><span class="cx"> if {$binary} {
</span><del>- set cmdline [list $tarcmd ${tarflags}${qflag}xOf ../$fetchfile +PORTFILE > Portfile]
</del><ins>+ set cmdline [list $tarcmd ${tarflags}${qflag}xOf $filepath +PORTFILE > Portfile]
</ins><span class="cx"> } else {
</span><del>- set cmdline [list $tarcmd ${tarflags}${qflag}xf $fetchfile]
</del><ins>+ set cmdline [list $tarcmd ${tarflags}${qflag}xf $filepath]
</ins><span class="cx"> }
</span><span class="cx"> ui_debug $cmdline
</span><span class="cx"> if {[catch {exec {*}$cmdline} result]} {
</span></span></pre>
</div>
</div>
</body>
</html>