[138944] trunk/base/src

[raimue at macports.org]

Revision: 138944
          https://trac.macports.org/changeset/138944
Author:   raimue at macports.org
Date:     2015-07-24 13:43:24 -0700 (Fri, 24 Jul 2015)
Log Message:
-----------
macports1.0, port1.0: Remove ui_*_fetch and ui_*_checksum

These seem to be a strange artifact from the implementation of the logging
framework. They were added in r52854, but is only in use at a single location.
However, it behaves exactly like the normal ui_*, so it is redundant.

Revision Links:
--------------
    https://trac.macports.org/changeset/52854

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl
    trunk/base/src/port1.0/portchecksum.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2015-07-24 20:35:45 UTC (rev 138943)
+++ trunk/base/src/macports1.0/macports.tcl	2015-07-24 20:43:24 UTC (rev 138944)
@@ -41,7 +41,7 @@
 package require Tclx
 
 namespace eval macports {
-    namespace export bootstrap_options user_options portinterp_options open_mports ui_priorities port_phases
+    namespace export bootstrap_options user_options portinterp_options open_mports ui_priorities
     variable bootstrap_options "\
         portdbpath binpath auto_path extra_env sources_conf prefix portdbformat \
         portarchivetype portautoclean \
@@ -74,7 +74,6 @@
     variable open_mports {}
 
     variable ui_priorities "error warn msg notice info debug any"
-    variable port_phases "any fetch checksum"
     variable current_phase main
 
     variable ui_prefix "---> "
@@ -276,14 +275,10 @@
     } catch * {
         set prefix [ui_prefix_default $priority]
     }
-    set phases {fetch checksum}
     try {
         ::ui_init $priority $prefix $channels($priority) {*}$args
     } catch * {
         interp alias {} ui_$priority {} ui_message $priority $prefix {}
-        foreach phase $phases {
-            interp alias {} ui_${priority}_$phase {} ui_message $priority $prefix $phase
-        }
     }
 }
 
@@ -1303,9 +1298,6 @@
     # instantiate the UI call-backs
     foreach priority $macports::ui_priorities {
         $workername alias ui_$priority ui_$priority
-        foreach phase $macports::port_phases {
-            $workername alias ui_${priority}_$phase ui_${priority}_$phase
-        }
     }
     # add the UI progress call-back
     if {[info exists macports::ui_options(progress_download)]} {

Modified: trunk/base/src/port1.0/portchecksum.tcl
===================================================================
--- trunk/base/src/port1.0/portchecksum.tcl	2015-07-24 20:35:45 UTC (rev 138943)
+++ trunk/base/src/port1.0/portchecksum.tcl	2015-07-24 20:43:24 UTC (rev 138944)
@@ -281,7 +281,7 @@
                         ui_debug "[format [msgcat::mc "Correct (%s) checksum for %s"] $type $distfile]"
                     } else {
                         ui_error "[format [msgcat::mc "Checksum (%s) mismatch for %s"] $type $distfile]"
-                        ui_info_fetch "[format [msgcat::mc "Portfile checksum: %s %s %s"] $distfile $type $sum]"
+                        ui_info "[format [msgcat::mc "Portfile checksum: %s %s %s"] $distfile $type $sum]"
                         ui_info "[format [msgcat::mc "Distfile checksum: %s %s %s"] $distfile $type $calculated_sum]"
 
                         # Raise the failure flag
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150724/cd703ee7/attachment.html>