[70633] branches/gsoc10-configfiles/base/src/registry2.0/portimage.tcl

[and.damore at macports.org]

Revision: 70633
          http://trac.macports.org/changeset/70633
Author:   and.damore at macports.org
Date:     2010-08-15 12:00:40 -0700 (Sun, 15 Aug 2010)
Log Message:
-----------
added exception to stop upgrade when modified config files exists

Modified Paths:
--------------
    branches/gsoc10-configfiles/base/src/registry2.0/portimage.tcl

Modified: branches/gsoc10-configfiles/base/src/registry2.0/portimage.tcl
===================================================================
--- branches/gsoc10-configfiles/base/src/registry2.0/portimage.tcl	2010-08-15 18:39:00 UTC (rev 70632)
+++ branches/gsoc10-configfiles/base/src/registry2.0/portimage.tcl	2010-08-15 19:00:40 UTC (rev 70633)
@@ -139,7 +139,7 @@
             set changed_files [_check_config_files_changed $requested [$requested imagefiles] [$requested imagefiles_with_md5]]
             if {$changed_files ne ""} {
                 puts "GSOCDBG:\t_check_config_files_changed: - SKIPPING DEACTIVATE"
-                return -code error "Image error: run port upgrade -config-upgrade ${name}"
+                throw registry::image-error "Image error: run port upgrade -config-upgrade ${name}"
             } else {
                 if {$noexec || ![registry::run_target $a deactivate [list ports_nodepcheck 1]]} {
                     puts "GSOCDBG:\t\tactivate called deactivate via direct call"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100815/d28fe7bc/attachment.html>