<!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>[138095] trunk/base/src/registry2.0/portuninstall.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/138095">138095</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2015-06-27 22:20:40 -0700 (Sat, 27 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>recursive uninstall: correctly handle case where only some versions of a port have the requested flag, do more fine-grained dependent checking, style and efficiency improvements</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcregistry20portuninstalltcl">trunk/base/src/registry2.0/portuninstall.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcregistry20portuninstalltcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/registry2.0/portuninstall.tcl (138094 => 138095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/registry2.0/portuninstall.tcl 2015-06-28 03:36:46 UTC (rev 138094)
+++ trunk/base/src/registry2.0/portuninstall.tcl 2015-06-28 05:20:40 UTC (rev 138095)
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> ui_msg "For $portname @${composite_spec}: skipping uninstall (dry run)"
</span><span class="cx"> # allow deps to not be excluded from the list below just because this port is still a dependent
</span><span class="cx"> if {[info exists options(ports_uninstall_follow-dependencies)] && [string is true -strict $options(ports_uninstall_follow-dependencies)]} {
</span><del>- set uports [list $portname]
</del><ins>+ set uports [list [list $portname $version $revision $variants]]
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> ui_msg "$UI_PREFIX [format [msgcat::mc "Uninstalling %s @%s"] $portname $composite_spec]"
</span><span class="lines">@@ -307,25 +307,21 @@
</span><span class="cx"> set uninstalling_this_dep 0
</span><span class="cx"> if {![catch {set ilist [registry::installed $dep]}]} {
</span><span class="cx"> foreach i $ilist {
</span><del>- set iversion [lindex $i 1]
- set irevision [lindex $i 2]
- set ivariants [lindex $i 3]
</del><ins>+ lassign $i dep iversion irevision ivariants
+ if {[list $dep $iversion $irevision $ivariants] in $uports} {
+ continue
+ }
</ins><span class="cx"> set regref [registry::open_entry $dep $iversion $irevision $ivariants [lindex $i 5]]
</span><span class="cx"> if {![registry::property_retrieve $regref requested]} {
</span><del>- set dependentlist [registry::list_dependents $dep $iversion $irevision $ivariants]
- set dependents {}
- foreach depdt $dependentlist {
- lappend dependents [lindex $depdt 2]
- }
</del><span class="cx"> set all_dependents_uninstalling 1
</span><del>- foreach depdt $dependents {
- if {[lsearch -exact $uports $depdt] == -1} {
</del><ins>+ foreach depdt [$regref dependents] {
+ if {[list [$depdt name] [$depdt version] [$depdt revision] [$depdt variants]] ni $uports} {
</ins><span class="cx"> set all_dependents_uninstalling 0
</span><span class="cx"> break
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if {$all_dependents_uninstalling} {
</span><del>- lappend uports $dep
</del><ins>+ lappend uports [list $dep $iversion $irevision $ivariants]
</ins><span class="cx"> lappend portilist $dep@${iversion}_${irevision}${ivariants}
</span><span class="cx"> set uninstalling_this_dep 1
</span><span class="cx"> }
</span><span class="lines">@@ -337,7 +333,7 @@
</span><span class="cx"> foreach depref $deprefs {
</span><span class="cx"> set depdeps [registry_uninstall::generate_deplist $depref $optionslist]
</span><span class="cx"> foreach d $depdeps {
</span><del>- if {[lsearch -exact [lrange $alldeps $j+1 end] $d] == -1} {
</del><ins>+ if {$d ni [lrange $alldeps $j+1 end]} {
</ins><span class="cx"> lappend alldeps $d
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -354,21 +350,16 @@
</span><span class="cx">
</span><span class="cx"> # uninstall all dependencies in order from uports
</span><span class="cx"> foreach dp $uports {
</span><del>- if {![catch {set ilist [registry::installed $dp]}]} {
- foreach i $ilist {
- set iversion [lindex $i 1]
- set irevision [lindex $i 2]
- set ivariants [lindex $i 3]
- set regref [registry::open_entry $dp $iversion $irevision $ivariants [lindex $i 5]]
- if {[info exists options(ports_dryrun)] && [string is true -strict $options(ports_dryrun)]} {
- if {$dp ne $portname} {
- ui_msg "For $dp @${iversion}_${irevision}${ivariants}: skipping uninstall (dry run)"
- }
- } else {
- if {[info exists options(ports_uninstall_no-exec)] || ![registry::run_target $regref uninstall [array get options]]} {
- registry_uninstall::uninstall $dp $iversion $irevision $ivariants [array get options]
- }
</del><ins>+ lassign $dp iname iversion irevision ivariants
+ if {![catch {registry::open_entry $iname $iversion $irevision $ivariants ""} regref]} {
+ if {[info exists options(ports_dryrun)] && [string is true -strict $options(ports_dryrun)]} {
+ if {$iname ne $portname} {
+ ui_msg "For $iname @${iversion}_${irevision}${ivariants}: skipping uninstall (dry run)"
</ins><span class="cx"> }
</span><ins>+ } else {
+ if {[info exists options(ports_uninstall_no-exec)] || ![registry::run_target $regref uninstall [array get options]]} {
+ registry_uninstall::uninstall $iname $iversion $irevision $ivariants [array get options]
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>