Index: /locker/update-system/bin/build-update
===================================================================
--- /locker/update-system/bin/build-update	(revision 691)
+++ /locker/update-system/bin/build-update	(revision 692)
@@ -12,4 +12,5 @@
 
 my $scriptsdev = "";
+my $force = 0;
 
 GetOptions(
@@ -20,4 +21,5 @@
 #	   "redo-all" => sub {$redodelete = $redoadd = $redoreplace = $redodiff = 1;},
 	   "dev" => sub {$scriptsdev = "dev";},
+           "force" => \$force,
 		  );
 
@@ -34,4 +36,12 @@
 
 (-d $proposaldir) or die "Can't find $proposaldir, did you run propose-update?\n";
+if (-e $outdir) {
+    if ($force) {
+        print STDERR "Clobbering $outdir.\n";
+        `rm -rf '$outdir'`;
+    } else {
+        die "Output directory $outdir exists; try --force.\n";
+    }
+}
 ((! -e $outdir) && mkdir($outdir)) or die "mkdir($outdir) failed: $!";
 
@@ -94,5 +104,5 @@
 set -e -o noclobber
 
-die () { echo "$1" >&2; exit 1; }
+die () { echo "$1" >&2; rm .scripts-security-upd-lock; exit 1; }
 
 patchdir=$(dirname "$0")
