<!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>[120508] branches/gsoc14-cleanup/src/macports1.0/reclaim.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/120508">120508</a></dd>
<dt>Author</dt> <dd>ksammons@macports.org</dd>
<dt>Date</dt> <dd>2014-05-30 13:26:49 -0700 (Fri, 30 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge branch 'svn'</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc14cleanupsrcmacports10reclaimtcl">branches/gsoc14-cleanup/src/macports1.0/reclaim.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc14cleanupsrcmacports10reclaimtcl"></a>
<div class="modfile"><h4>Modified: branches/gsoc14-cleanup/src/macports1.0/reclaim.tcl (120507 => 120508)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc14-cleanup/src/macports1.0/reclaim.tcl 2014-05-30 20:23:50 UTC (rev 120507)
+++ branches/gsoc14-cleanup/src/macports1.0/reclaim.tcl 2014-05-30 20:26:49 UTC (rev 120508)
</span><span class="lines">@@ -27,48 +27,58 @@
</span><span class="cx"> # None
</span><span class="cx">
</span><span class="cx"> uninstall_inactive
</span><del>- check_distfiles
</del><ins>+ remove_distfiles
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-proc walk_files {dir delete} {
</del><ins>+proc walk_files {dir delete dist_files} {
</ins><span class="cx">
</span><del>- # Recursively walk through each item in the given directory and if requested, delete each file that isn't a directory.
</del><ins>+ # Recursively walk through each directory that isn't an installed port and if delete each file that isn't a directory if requested.
</ins><span class="cx"> # Args:
</span><del>- # dir - A string path of the given directory to walk through
- # delete - Whether to delete each file found that isn't a directory or not. Set to 'yes' or 'no'.
</del><ins>+ # dir - A string path of the given directory to walk through
+ # delete - Whether to delete each file found that isn't a directory or not. Set to 'yes' or 'no'.
+ # dist_files - A list of the names of all distfiles from installed ports
</ins><span class="cx"> # Returns:
</span><del>- # None
</del><ins>+ # 'no' if no distfiles were found, and 'yes' if distfiles were found.
</ins><span class="cx">
</span><ins>+ set found_distfile no
+
</ins><span class="cx"> foreach item [readdir $dir] {
</span><span class="cx">
</span><span class="cx"> set currentPath [file join $dir $item]
</span><span class="cx">
</span><span class="cx"> if {[file isdirectory $currentPath]} {
</span><del>- walk_files $currentPath $delete
</del><ins>+ walk_files $currentPath $delete $dist_files
</ins><span class="cx">
</span><span class="cx"> } else {
</span><del>- puts "Found distfile: $item"
</del><span class="cx">
</span><del>- if {$delete eq "yes"} {
- set path [file join $dir $item]
- puts "Removing distfile: $item"
</del><ins>+ # Only care about files that exist in /distfiles that are not a distfile from an installed file.
+ if {[lsearch $dist_files $item] == -1} {
</ins><span class="cx">
</span><del>- #Because we're only deleting files (not directories) that we know exist, if there was an error, it's because of lack of root privledges.
- if {[catch {file delete $path} result]} {
- elevateToRoot "reclaim"
- file delete $path
</del><ins>+ puts "Found distfile: $item"
+ set found_distfile yes
+
+ if {$delete eq "yes"} {
+ set path [file join $dir $item]
+ puts "Removing distfile: $item"
+
+ # Because we're only deleting files (not directories) that we know exist, if there was an error, it's because of lack of root privledges.
+ if {[catch {file delete $path} result]} {
+ elevateToRoot "reclaim"
+ file delete $path
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ return $found_distfile
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-proc check_distfiles {} {
</del><ins>+proc remove_distfiles {} {
</ins><span class="cx">
</span><span class="cx"> # Check for distfiles in both the root, and home directories. If found, delete them.
</span><span class="cx"> # Args:
</span><span class="cx"> # None
</span><del>- #
</del><span class="cx"> # Returns:
</span><span class="cx"> # 0 on successful execution
</span><span class="cx">
</span><span class="lines">@@ -76,14 +86,37 @@
</span><span class="cx"> global macports::user_home
</span><span class="cx">
</span><span class="cx"> # The root and home distfile folder locations, respectively.
</span><del>- set root [file join ${macports::portdbpath} distfiles]
- set home ${macports::user_home}/.macports$root
</del><ins>+ set root_dist [file join ${macports::portdbpath} distfiles]
+ set home_dist ${macports::user_home}/.macports$root_dist
</ins><span class="cx">
</span><del>- # Walk through each directory, and delete any files found.
- walk_files $root yes
- walk_files $home yes
</del><ins>+ set port_info [get_info]
+ set dist_names [list]
</ins><span class="cx">
</span><del>- # Returning 0 is in style this year.
</del><ins>+ foreach port $port_info {
+
+ # Get mport reference
+ set mport [mportopen_installed [lindex $port 0] [lindex $port 1] [lindex $port 2] [lindex $port 3] {}]
+
+ # Setup sub-Tcl-interpreter that executed the installed port
+ set workername [ditem_key $mport workername]
+
+ # Append that port's distfiles to the list
+ lappend dist_names [$workername eval return \$distfiles]
+
+ }
+
+ # Don't flag .DS_Store, yo
+ lappend dist_names ".DS_Store"
+
+ # Walk through each directory, and delete any files found. Alert the user if no files were found.
+ if {[walk_files $root_dist yes $dist_names] eq "no"} {
+ puts "No distfiles found in root directory."
+ }
+
+ if {[walk_files $home_dist yes $dist_names] eq "no"} {
+ puts "No distfiles found in home directory."
+ }
+
</ins><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>