Changeset 118302 for trunk/base

Timestamp:

Mar 29, 2014, 4:41:17 PM (10 years ago)

Author:

cal@…

Message:

base: Print a message when rolling back on user request, prevent rollback interruption

File:

• trunk/base/src/registry2.0/portimage.tcl (modified) (4 diffs)

trunk/base/src/registry2.0/portimage.tcl

@@ -40 +40 @@
 package require macports 1.0
 package require Pextlib 1.0
+
+package require Tclx
 
 set UI_PREFIX "--> "
@@ -540 +542 @@
                     }
                 }
+            } catch {{POSIX SIG SIGINT} eCode eMessage} {
+                # Pressing ^C will (often?) print "^C" to the terminal; send
+                # a linebreak so our message appears after that.
+                ui_msg ""
+                ui_msg "Control-C pressed, rolling back, please wait."
+                # can't do it here since we're already inside a transaction
+                set deactivate_this yes
+                throw
+            } catch {{POSIX SIG SIGTERM} eCode eMessage} {
+                ui_msg "SIGTERM received, rolling back, please wait."
+                # can't do it here since we're already inside a transaction
+                set deactivate_this yes
+                throw
             } catch {*} {
                 ui_debug "Activation failed, rolling back."
@@ -548 +563 @@
         }
     } catch {*} {
+        # This code must run to completion, or the installation might be left
+        # in an inconsistent state
+        signal block {TERM INT}
+
         # roll back activation of this port
         if {[info exists deactivate_this]} {
@@ -564 +583 @@
             }
         }
+
+        # We've completed all critical operations, re-enable the TERM and INT
+        # signals.
+        signal unblock {TERM INT}
+
         # remove temp image dir
         ::file delete -force $extracted_dir