<!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>[124042] branches/gsoc14-cleanup/src/macports1.0/doctor.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/124042">124042</a></dd>
<dt>Author</dt> <dd>ksammons@macports.org</dd>
<dt>Date</dt> <dd>2014-08-17 11:18:59 -0700 (Sun, 17 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Progress bar output for port-file checking added by Neverpanic.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc14cleanupsrcmacports10doctortcl">branches/gsoc14-cleanup/src/macports1.0/doctor.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc14cleanupsrcmacports10doctortcl"></a>
<div class="modfile"><h4>Modified: branches/gsoc14-cleanup/src/macports1.0/doctor.tcl (124041 => 124042)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc14-cleanup/src/macports1.0/doctor.tcl 2014-08-17 17:44:23 UTC (rev 124041)
+++ branches/gsoc14-cleanup/src/macports1.0/doctor.tcl 2014-08-17 18:18:59 UTC (rev 124042)
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> # Returns:
</span><span class="cx"> # None
</span><span class="cx">
</span><del>- if {${doctor::quiet} eq 0} {
</del><ins>+ if {${doctor::quiet} == 0} {
</ins><span class="cx"> ui_msg -nonewline "Checking for $string... "
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -335,38 +335,75 @@
</span><span class="cx">
</span><span class="cx"> set apps [reclaim::get_info]
</span><span class="cx">
</span><ins>+ array set activeApps {}
+ set totalFiles 0
+
</ins><span class="cx"> foreach app $apps {
</span><span class="cx">
</span><del>-
</del><span class="cx"> set name [lindex $app 0]
</span><span class="cx"> set active [lindex $app 4]
</span><span class="cx"> set files [registry::port_registered $name]
</span><span class="cx">
</span><del>- if {$active} {
</del><ins>+ if {$active} {
+ set activeApps($name) $files
+ incr totalFiles [llength $files]
+ }
+ }
</ins><span class="cx">
</span><del>- foreach file $files {
</del><ins>+ set fancyOutput [expr {![macports::ui_isset ports_debug] && ![macports::ui_isset ports_verbose] && [info exists macports::ui_options(progress_generic)]}]
+ if {$fancyOutput} {
+ set progress $macports::ui_options(progress_generic)
+ }
</ins><span class="cx">
</span><del>- output "file '$file' on disk"
-
</del><ins>+ if {$totalFiles > 0} {
+ if {$fancyOutput} {
+ output "files installed by ports on disk"
+ if {${doctor::quiet} == 0} {
+ # we need a newline here or the progress bar will overwrite the line
+ ui_msg ""
+ }
+ $progress start
+ }
+
+ set currentFile 1
+ foreach name [lsort [array names activeApps]] {
+ foreach file $activeApps($name) {
+ if {$fancyOutput} {
+ $progress update $currentFile $totalFiles
+ } else {
+ output "file '$file' on disk"
+ }
+
</ins><span class="cx"> if {![file exists $file]} {
</span><del>- success_fail 0
</del><ins>+ if {$fancyOutput} {
+ $progress intermission
+ } else {
+ success_fail 0
+ }
+
</ins><span class="cx"> ui_warn "couldn't find file '$file' for port '$name'. Please deactivate and reactivate the port to fix this issue."
</span><del>-
</del><span class="cx"> } elseif {![file readable $file]} {
</span><del>- success_fail 0
- ui_warn "'$file' installed by port '$name' is currently not readable. Please try again. If this problem persists, please contact\
- the mailing list."
</del><ins>+ if {$fancyOutput} {
+ $progress intermission
+ } else {
+ success_fail 0
+ }
</ins><span class="cx">
</span><del>- } else {
-
</del><ins>+ ui_warn "'$file' installed by port '$name' is currently not readable. Please try again. If this problem persists, please contact the mailing list."
+ } elseif {!$fancyOutput} {
</ins><span class="cx"> success_fail 1
</span><span class="cx"> }
</span><ins>+
+ incr currentFile
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ if {$fancyOutput} {
+ $progress finish
+ }
</ins><span class="cx"> }
</span><ins>+ }
</ins><span class="cx">
</span><del>- }
-
</del><span class="cx"> proc check_tarballs {} {
</span><span class="cx">
</span><span class="cx"> # Checks if the archives for each installed port in /opt/local/var/macports/software/$name is actually in there. If not, it warns
</span><span class="lines">@@ -388,7 +425,7 @@
</span><span class="cx"> set variants [lindex $app 3]
</span><span class="cx"> set epoch [lindex $app 5]
</span><span class="cx">
</span><del>- output "'$name's tarball on disk"
</del><ins>+ output "'$app's tarball on disk"
</ins><span class="cx">
</span><span class="cx"> set ref [registry::open_entry $name $version $revision $variants $epoch]
</span><span class="cx"> set image_dir [registry::property_retrieve $ref location]
</span></span></pre>
</div>
</div>
</body>
</html>