Changeset 813

Timestamp:

09/20/07 17:44:36 (1 year ago)

Author:

Gregor

Message:

hcf/process.d, sss/conf.d: Now throws an exception if a hook command fails, rather than

exiting. This allows DSSS to clean up after itself more effectively.

Files:

• trunk/docs/ChangeLog (modified) (1 diff)
• trunk/hcf/process.d (modified) (3 diffs)
• trunk/sss/conf.d (modified) (2 diffs)

trunk/docs/ChangeLog

@@ -9 +9 @@
-        - installdir hook command now manifests properly.
-        - 'include' setting, counter to 'exclude' (see ticket #111).
+        - Now throws an exception if a hook command fails, rather than
+          exiting. This allows DSSS to clean up after itself more effectively.
-
-0.72 from 0.71:

trunk/hcf/process.d

@@ -256 +256 @@
-}
-
+/** Exception to be thrown when a command called dies */
+class ProcessDeathException : Exception {
+    this(char[] smsg)
+    {
+        super(smsg);
+    }
+}
+
-/** system + guarantee success */
-void systemOrDie(char[] cmd)
@@ -267 +275 @@
-        if(p!=-1) cmd=cmd[0..p];
-        writefln("Command " ~ cmd ~ " returned with code ", res, ", aborting.");
-exit(1
+throw new ProcessDeathException("Command failed, aborting."
-    }
-}
@@ -314 +322 @@
-        if(p!=-1) cmd=cmd[0..p];
-        writefln("Command " ~ cmd ~ " returned with code ", res, ", aborting.");
-exit(1
+throw new ProcessDeathException("Command failed, aborting."
-    }
-}

trunk/sss/conf.d

@@ -847 +847 @@
-}
-
+/** Exception to be thrown when a scripted step fails */
+class HookException : Exception {
+    this(char[] smsg)
+    {
+        super(smsg);
+    }
+}
+
-/** Perform a pre- or post- script step. Returns a list of installed files (if
- * applicable) */
@@ -879 +887 @@
-                   cmd[0..6] == "error ") {
-            writefln("ERROR: %s", cmd[6..$]);
-exit(1
+throw new HookException("error hook encountered."
-            
-        } else if (cmd.length > 8 &&