Changeset 14565 for trunk/base

Timestamp:

Oct 11, 2005, 8:34:55 PM (19 years ago)

Author:

jberry

Message:

Catch and report nicely any error from editor invocation, just because
I know Juan will ask about it. Wait a minute...he already did! ;)

File:

• trunk/base/src/port/port.tcl (modified) (3 diffs)

trunk/base/src/port/port.tcl

@@ -3 +3 @@
 exec @TCLSH@ "$0" "$@"
 # port.tcl
-# $Id: port.tcl,v 1.122 2005/10/11 20:17:42 jberry Exp $
+# $Id: port.tcl,v 1.123 2005/10/11 20:34:55 jberry Exp $
 #
 # Copyright (c) 2004 Robert Shaw <rshaw@opendarwin.org>
@@ -1744 +1744 @@
                                                 # We need it to evaluate the editor, and the editor
                                                 # may want stuff from it as well, like TERM.
-                                                array set env [array get boot_env]
+                                                array unset env_save; array set env_save [array get env]
+                                                array unset env; array set env [array get boot_env]
                                                 
                                                 # Find an editor to edit the portfile
@@ -1757 +1758 @@
                                                         fatal "No EDITOR is specified in your environment"
                                                 } else {
-                                                        eval exec $editor $portfile
-                                                }                                               
+                                                        if {[catch {eval exec $editor $portfile} result]} {
+                                                                global errorInfo
+                                                                ui_debug "$errorInfo"
+                                                                fatal_softcontinue "unable to invoke editor: $result"
+                                                        }
+                                                }
+                                                
+                                                # Restore internal dp environment
+                                                array unset env; array set env [array get env_save]
                                         }