<!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>[64639] trunk/base/src</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="http://trac.macports.org/changeset/64639">64639</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2010-03-12 07:46:13 -0800 (Fri, 12 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix up running of activate target and autoclean</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcmacports10macportstcl">trunk/base/src/macports1.0/macports.tcl</a></li>
<li><a href="#trunkbasesrcport10portutiltcl">trunk/base/src/port1.0/portutil.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 (64638 => 64639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/macports.tcl 2010-03-12 14:28:00 UTC (rev 64638)
+++ trunk/base/src/macports1.0/macports.tcl 2010-03-12 15:46:13 UTC (rev 64639)
</span><span class="lines">@@ -1295,10 +1295,11 @@
</span><span class="cx"> set regref [lindex [registry::entry imaged $name $version $revision $variants] 0]
</span><span class="cx"> set portfile_dir [file join ${registry.path} registry portfiles $name "${version}_${revision}${variants}"]
</span><span class="cx"> file mkdir $portfile_dir
</span><del>- set fd [open ${portfile_dir}/Portfile w]
</del><ins>+ set fd [open "${portfile_dir}/Portfile" w]
</ins><span class="cx"> puts $fd [$regref portfile]
</span><span class="cx"> close $fd
</span><del>-
</del><ins>+ file mtime "${portfile_dir}/Portfile" [$regref date]
+
</ins><span class="cx"> set variations {}
</span><span class="cx"> set minusvariant [lrange [split [$regref negated_variants] -] 1 end]
</span><span class="cx"> set plusvariant [lrange [split [$regref variants] +] 1 end]
</span><span class="lines">@@ -1611,18 +1612,17 @@
</span><span class="cx"> if {[string equal $target "install"]} {
</span><span class="cx"> # mark port as explicitly requested
</span><span class="cx"> $workername eval set user_options(ports_requested) 1
</span><del>-
- # If we're doing an install, check if we should clean after
- if {[string equal ${macports::portautoclean} "yes"]} {
- set clean 1
- }
-
</del><ins>+
</ins><span class="cx"> # If we're doing image installs, then we should activate after install
</span><span class="cx"> # xxx: This isn't pretty
</span><span class="cx"> if { [string equal ${macports::registry.installtype} "image"] } {
</span><span class="cx"> set target activate
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ if {[string equal ${macports::portautoclean} "yes"] && ([string equal $target "install"] || [string equal $target "activate"])} {
+ # If we're doing an install, check if we should clean after
+ set clean 1
+ }
</ins><span class="cx">
</span><span class="cx"> # Build this port with the specified target
</span><span class="cx"> set result [$workername eval eval_targets $target]
</span></span></pre></div>
<a id="trunkbasesrcport10portutiltcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portutil.tcl (64638 => 64639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portutil.tcl 2010-03-12 14:28:00 UTC (rev 64638)
+++ trunk/base/src/port1.0/portutil.tcl 2010-03-12 15:46:13 UTC (rev 64639)
</span><span class="lines">@@ -1460,7 +1460,7 @@
</span><span class="cx"> set dlist $targets
</span><span class="cx">
</span><span class="cx"> # the statefile will likely be autocleaned away after install,
</span><del>- # so special-case ignore already-completed install and activate
</del><ins>+ # so special-case already-completed install and activate
</ins><span class="cx"> if {[registry_exists $name $version $revision $portvariants]} {
</span><span class="cx"> if {$target == "install"} {
</span><span class="cx"> ui_debug "Skipping $target ($name) since this port is already installed"
</span><span class="lines">@@ -1470,20 +1470,11 @@
</span><span class="cx"> if {[registry_prop_retr $regref active] != 0} {
</span><span class="cx"> # Something to close the registry entry may be called here, if it existed.
</span><span class="cx"> ui_debug "Skipping $target ($name @${version}_${revision}${portvariants}) since this port is already active"
</span><ins>+ return 0
</ins><span class="cx"> } else {
</span><del>- # do the activate here since target_run doesn't know how to selectively ignore the preceding steps
- if {[info exists ports_dryrun] && $ports_dryrun == "yes"} {
- ui_msg "For $name: skipping $target (dry run)"
- } else {
- if {[catch {registry_activate $name ${version}_${revision}${portvariants} [array get user_options]} result]} {
- global errorInfo
- ui_debug "$errorInfo"
- ui_error "activating $name @${version}_${revision}${portvariants} failed: $result"
- return 1
- }
- }
</del><ins>+ # run the activate target but ignore its (completed) dependencies
+ return [target_run [lindex [dlist_search $dlist provides $target] 0]]
</ins><span class="cx"> }
</span><del>- return 0
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>