<!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>[121235] 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/121235">121235</a></dd>
<dt>Author</dt> <dd>ksammons@macports.org</dd>
<dt>Date</dt> <dd>2014-06-20 16:14:23 -0700 (Fri, 20 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added error handling in key areas.</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 (121234 => 121235)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc14-cleanup/src/macports1.0/reclaim.tcl 2014-06-20 23:14:22 UTC (rev 121234)
+++ branches/gsoc14-cleanup/src/macports1.0/reclaim.tcl 2014-06-20 23:14:23 UTC (rev 121235)
</span><span class="lines">@@ -35,9 +35,9 @@
</span><span class="cx">
</span><span class="cx"> # TODO:
</span><span class="cx"> # Add ui_debug statments
</span><del>-# Catch some error-prone areas.
</del><span class="cx">
</span><span class="cx"> # Finished:
</span><ins>+# Catch some error-prone areas.
</ins><span class="cx"> # Remove the useless/structure comments and add actual docstrings.
</span><span class="cx"> # Add copyright notice
</span><span class="cx"> # Check if inactive files are dependents for other files.
</span><span class="lines">@@ -101,20 +101,25 @@
</span><span class="cx"> set up_dir [file dirname $dir]
</span><span class="cx">
</span><span class="cx"> ui_msg "Found empty directory: $dir. Attempting to delete."
</span><del>- file delete -force $dir
</del><span class="cx">
</span><ins>+ if {[catch {file delete -force $dir} error] } {
+ ui_error "something went wrong when trying to delete $dir"
+ }
+
</ins><span class="cx"> walk_files $up_dir $delete $dist_paths
</span><del>-
</del><span class="cx"> return
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> foreach item [readdir $dir] {
</span><ins>+
</ins><span class="cx"> set currentPath [file join $dir $item]
</span><span class="cx">
</span><span class="cx"> if {[file isdirectory $currentPath]} {
</span><ins>+
</ins><span class="cx"> walk_files $currentPath $delete $dist_paths
</span><span class="cx">
</span><span class="cx"> } else {
</span><ins>+
</ins><span class="cx"> # If the current file isn't in the known-installed-distfiles
</span><span class="cx"> if {[lsearch $dist_paths $currentPath] == -1} {
</span><span class="cx"> set found_distfile yes
</span><span class="lines">@@ -124,7 +129,9 @@
</span><span class="cx"> if {$delete eq "yes"} {
</span><span class="cx"> ui_msg "Removing distfile: $item"
</span><span class="cx">
</span><del>- file delete $currentPath
</del><ins>+ if {[catch {file delete $currentPath} error]} {
+ ui_error "something went wrong when trying to delete $currentPath"
+ }
</ins><span class="cx">
</span><span class="cx"> # If the directory is now empty, recursively call on this directory, to delete it.
</span><span class="cx"> if {[is_empty_dir $dir]} {
</span><span class="lines">@@ -134,6 +141,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return $found_distfile
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -163,7 +171,9 @@
</span><span class="cx"> set variants [lindex $port 3]
</span><span class="cx">
</span><span class="cx"> # Get mport reference
</span><del>- set mport [mportopen_installed $name $version $revision $variants {}]
</del><ins>+ if {[catch {set mport [mportopen_installed $name $version $revision $variants {}]} error]} {
+ ui_error "something went wrong when trying to get an mport reference."
+ }
</ins><span class="cx">
</span><span class="cx"> # Setup sub-Tcl-interpreter that executed the installed port
</span><span class="cx"> set workername [ditem_key $mport workername]
</span><span class="lines">@@ -199,6 +209,19 @@
</span><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ proc close_file {file} {
+
+ # Closes the file, handling error catching if needed.
+ #
+ # Args:
+ # file - The file handler
+ # Returns:
+ # None
+ if {[catch {close $file} error]} {
+ ui_error "something went wrong when closing file, $file."
+ }
+ }
+
</ins><span class="cx"> proc is_inactive {app} {
</span><span class="cx">
</span><span class="cx"> # Determine's whether an application is inactive or not.
</span><span class="lines">@@ -224,7 +247,7 @@
</span><span class="cx"> # A multidimensional list where each app is a sublist, i.e., [{First Application Info} {Second Application Info} {...}]
</span><span class="cx"> # Indexes of each sublist are: 0 = name, 1 = version, 2 = revision, 3 = variants, 4 = activity, and 5 = epoch.
</span><span class="cx">
</span><del>- return [registry::installed]
</del><ins>+ return [registry::installed]
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc update_last_run {} {
</span><span class="lines">@@ -239,7 +262,7 @@
</span><span class="cx"> set path [file join ${macports::portdbpath} last_reclaim.txt]
</span><span class="cx"> set fd [open $path w]
</span><span class="cx"> puts $fd [clock seconds]
</span><del>- close $fd
</del><ins>+ close_file $fd
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc check_last_run {} {
</span><span class="lines">@@ -257,7 +280,7 @@
</span><span class="cx">
</span><span class="cx"> set fd [open $path r]
</span><span class="cx"> set time [gets $fd]
</span><del>- close $fd
</del><ins>+ close_file $fd
</ins><span class="cx">
</span><span class="cx"> if {$time ne ""} {
</span><span class="cx"> if {[clock seconds] - $time > 1209600} {
</span><span class="lines">@@ -306,9 +329,12 @@
</span><span class="cx"> set name [lindex $app 0]
</span><span class="cx">
</span><span class="cx"> # Get all dependents for the current application
</span><del>- set dependents [registry::list_dependents $name [lindex 1] [lindex 2] [lindex 3]]
</del><ins>+ if {[catch {set dependents [registry::list_dependents $name [lindex 1] [lindex 2] [lindex 3]]} error]} {
+ ui_error "something went wrong when trying to enumerate all dependents for $name"
+ }
</ins><span class="cx">
</span><span class="cx"> if {dependents ne ""} {
</span><ins>+
</ins><span class="cx"> ui_warn "the following application ($name) is a dependent for $dependents. Are you positive you'd like to uninstall this
</span><span class="cx"> (this could break other applications)? \[Y/N\]"
</span><span class="cx">
</span><span class="lines">@@ -322,7 +348,9 @@
</span><span class="cx"> ui_msg "Uninstalling: $name"
</span><span class="cx">
</span><span class="cx"> # Note: 'uninstall' takes a name, version, revision, variants and an options list.
</span><del>- registry_uninstall::uninstall [lindex $app 0] [lindex $app 1] [lindex $app 2] [lindex $app 3] {}
</del><ins>+ if {[catch {registry_uninstall::uninstall $name [lindex $app 1] [lindex $app 2] [lindex $app 3] {}} error]} {
+ ui_error "something went wrong when uninstalling $name"
+ }
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> ui_msg "Not uninstalling applications."
</span></span></pre>
</div>
</div>
</body>
</html>