Index: locker/update-system/bin/propose-update
===================================================================
--- locker/update-system/bin/propose-update	(revision 446)
+++ locker/update-system/bin/propose-update	(revision 497)
@@ -46,5 +46,6 @@
   my $cwd = cwd();
   chdir($dir) or die $!;
-  `athrun scripts gtar zxf "/mit/scripts/deploy$scriptsdev/$package.tar.gz"`; $? && die "Failed to unpack $package.tar.gz: $?";
+  `athrun scripts gtar zxf "/mit/scripts/deploy$scriptsdev/$package/$package.tar.gz"`;
+  if ($?) { chdir($cwd); system("rmdir", "$dir"); die "Failed to unpack $package.tar.gz: $?"; }
   my @files=`athrun scripts gfind . -mindepth 1 -maxdepth 1 | grep -v .admin`;
   if (@files <= 1) {
@@ -67,5 +68,5 @@
   my @aonly, @bonly, @both;
   $a = $b = 0;
-  my $debug = 1;
+  my $debug = 0;
   local $Data::Dumper::Indent = 0;
   while ($a <= $#a || $b <= $#a) {
