<!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>[123649] branches/gsoc14-interactive/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/123649">123649</a></dd>
<dt>Author</dt> <dd>shasha@macports.org</dd>
<dt>Date</dt> <dd>2014-08-11 18:25:32 -0700 (Mon, 11 Aug 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>complete implementation of --follow-dependencies</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc14interactivebasesrcregistry20portuninstalltcl">branches/gsoc14-interactive/base/src/registry2.0/portuninstall.tcl</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc14interactivebasesrcregistry20portuninstalltcl"></a>
<div class="modfile"><h4>Modified: branches/gsoc14-interactive/base/src/registry2.0/portuninstall.tcl (123648 => 123649)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc14-interactive/base/src/registry2.0/portuninstall.tcl        2014-08-11 22:12:52 UTC (rev 123648)
+++ branches/gsoc14-interactive/base/src/registry2.0/portuninstall.tcl        2014-08-12 01:25:32 UTC (rev 123649)
</span><span class="lines">@@ -65,7 +65,8 @@
</span><span class="cx">             }
</span><span class="cx">         } else {
</span><span class="cx">             # grab the deps from the dep map
</span><del>-            set depmaplist [registry::list_depends $portname $version $revision $variants]
</del><ins>+            set portname [$port name]
+            set depmaplist [registry::list_depends $portname [$port version] [$port revision] [$port variants]]
</ins><span class="cx">             foreach dep $depmaplist {
</span><span class="cx">                 lappend all_dependencies [lindex $dep 0]
</span><span class="cx">             }
</span><span class="lines">@@ -74,8 +75,8 @@
</span><span class="cx">                 array set depportinfo [lindex $result 1]
</span><span class="cx">                 set porturl $depportinfo(porturl)
</span><span class="cx">                 set variations {}
</span><del>-                set minusvariant [lrange [split [registry::property_retrieve $ref negated_variants] -] 1 end]
-                set plusvariant [lrange [split $variants +] 1 end]
</del><ins>+                set minusvariant [lrange [split [registry::property_retrieve $port negated_variants] -] 1 end]
+                set plusvariant [lrange [split [$port variants] +] 1 end]
</ins><span class="cx">                 foreach v $plusvariant {
</span><span class="cx">                     lappend variations $v &quot;+&quot;
</span><span class="cx">                 }
</span><span class="lines">@@ -233,7 +234,10 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     set ref $port
</span><del>-    set all_dependencies [registry_uninstall::generate_deplist $port $optionslist]
</del><ins>+    # save list of dependencies if --follow-dependencies specified
+    if {[info exists options(ports_uninstall_follow-dependencies)]} {
+        set all_dependencies [registry_uninstall::generate_deplist $port $optionslist]
+    }
</ins><span class="cx"> 
</span><span class="cx">     if {[info exists options(ports_dryrun)] &amp;&amp; [string is true -strict $options(ports_dryrun)]} {
</span><span class="cx">         ui_msg &quot;For $portname @${composite_spec}: skipping uninstall (dry run)&quot;
</span><span class="lines">@@ -280,6 +284,7 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx">     
</span><ins>+    set uports {}
</ins><span class="cx">     # create list of all dependencies that will be uninstalled, if requested
</span><span class="cx">     if {[info exists options(ports_uninstall_follow-dependencies)] &amp;&amp; [string is true -strict $options(ports_uninstall_follow-dependencies)]} {
</span><span class="cx">         # don't uninstall dependencies' dependents
</span><span class="lines">@@ -287,10 +292,8 @@
</span><span class="cx">             unset options(ports_uninstall_follow-dependents)
</span><span class="cx">             set optionslist [array get options]
</span><span class="cx">         }
</span><del>-        unset options(ports_uninstall_follow-dependencies)
</del><span class="cx">         set alldeps $all_dependencies
</span><span class="cx">         set portilist {}
</span><del>-        set uports {}
</del><span class="cx">         for {set j 0} {$j &lt; [llength $alldeps]} {incr j} {
</span><span class="cx">             set dep [lindex $alldeps $j]
</span><span class="cx">             if {![catch {set ilist [registry::installed $dep]}]} {
</span><span class="lines">@@ -317,6 +320,7 @@
</span><span class="cx">                                     }
</span><span class="cx">                                 }
</span><span class="cx">                                 if {$count == [llength $dependents]} {
</span><ins>+                                    lappend uports $dep
</ins><span class="cx">                                     lappend portilist $dep@[lindex $i 1]_$irevision
</span><span class="cx">                                 }
</span><span class="cx">                             }
</span><span class="lines">@@ -326,35 +330,36 @@
</span><span class="cx">             }
</span><span class="cx">             set depref [registry::entry imaged $dep]
</span><span class="cx">             set depdeps [registry_uninstall::generate_deplist $depref $optionslist]
</span><del>-            foreach dep $depdeps {
-                set index [lsearch $alldeps $dep]
</del><ins>+            foreach d $depdeps {
+                set index [lsearch $alldeps $d]
</ins><span class="cx">                 if {$index == -1} {
</span><del>-                    lappend alldeps $dep 
</del><ins>+                    lappend alldeps $d 
</ins><span class="cx">                 }
</span><span class="cx">             }
</span><span class="cx">         }
</span><ins>+        ## User Interaction Question
+        # show a list of all dependencies to be uninstalled with a timeout when --follow-dependencies is specified
+        if {[info exists macports::ui_options(questions_yesno)]} {
+            $macports::ui_options(questions_yesno) &quot;The following dependencies will be uninstalled:&quot; &quot;Timeout_1&quot; $portilist {y} 10
+        }
+        unset options(ports_uninstall_follow-dependencies)
</ins><span class="cx">     }
</span><del>-    ## User Interaction Question
-    # show a list of all dependencies to be uninstalled with a timeout when --follow-dependencies is specified
-    if {[info exists macports::ui_options(questions_yesno)]} {
-        $macports::ui_options(questions_yesno) &quot;The following dependencies will be uninstalled:&quot; &quot;Timeout_1&quot; $portilist {y} 10
</del><ins>+
+    # uninstall all dependencies in order from uports
+    foreach dp $uports {
+        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_uninstall_no-exec)] || ![registry::run_target $regref uninstall [array get options]]} {
+                    registry_uninstall::uninstall $dp $iversion $irevision $ivariants [array get options]
+                }
+            }
+        }
</ins><span class="cx">     }
</span><span class="cx"> 
</span><del>-     # uninstall all dependencies in order from uports
-#    foreach dep $uports {
-#        if {![catch {set ilist [registry::installed $dep]}]} {
-#            foreach i $ilist {
-#                set iversion [lindex $i 1]
-#                set irevision [lindex $i 2]
-#                set ivariants [lindex $i 3]
-#                set regref [registry::open_entry $dep $iversion $irevision $ivariants [lindex $i 5]]
-#                if {[info exists options(ports_uninstall_no-exec)] || ![registry::run_target $regref uninstall $optionslist]} {
-#                    registry_uninstall::uninstall $dep $iversion $irevision $ivariants $optionslist
-#                }
-#                        }
-#                }
-#        }
-
</del><span class="cx">     return 0
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>