From 430d7c942f128b85a508488fd021ef8fa86d0acf Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Wed, 5 Jun 2013 22:03:23 -0700
Subject: [PATCH] Don't delete /etc/webmin on an upgrade failure

---
 makedebian.pl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/makedebian.pl b/makedebian.pl
index b7752e6c0..396fd49f1 100755
--- a/makedebian.pl
+++ b/makedebian.pl
@@ -239,7 +239,7 @@ print SCRIPT <<EOF;
 perl <<EOD;
 $maketemp
 EOD
-if [ "\$1" != "upgrade" ]; then
+if [ "\$1" != "upgrade" -a "\$1" != "abort-upgrade" ]; then
 	if [ "\$WEBMIN_PORT\" != \"\" ]; then
 		port=\$WEBMIN_PORT
 	else
@@ -260,7 +260,7 @@ open(SCRIPT, ">$postinstall_file");
 print SCRIPT <<EOF;
 #!/bin/sh
 inetd=`grep "^inetd=" /etc/$baseproduct/miniserv.conf 2>/dev/null | sed -e 's/inetd=//g'`
-if [ "\$1" = "upgrade" ]; then
+if [ "\$1" = "upgrade" -a "\$1" != "abort-upgrade" ]; then
 	# Upgrading the package, so stop the old webmin properly
 	if [ "\$inetd" != "1" ]; then
 		/etc/$baseproduct/stop >/dev/null 2>&1 </dev/null
@@ -355,7 +355,7 @@ system("chmod 755 $postinstall_file");
 open(SCRIPT, ">$preuninstall_file");
 print SCRIPT <<EOF;
 #!/bin/sh
-if [ "\$1" != "upgrade" ]; then
+if [ "\$1" != "upgrade" -a "\$1" != "abort-upgrade" ]; then
 	grep root=/usr/share/$baseproduct /etc/$baseproduct/miniserv.conf >/dev/null 2>&1
 	if [ "\$?" = 0 ]; then
 		# Package is being removed, and no new version of webmin
@@ -376,7 +376,7 @@ system("chmod 755 $preuninstall_file");
 open(SCRIPT, ">$postuninstall_file");
 print SCRIPT <<EOF;
 #!/bin/sh
-if [ "\$1" != "upgrade" ]; then
+if [ "\$1" != "upgrade" -a "\$1" != "abort-upgrade" ]; then
 	grep root=/usr/share/$baseproduct /etc/$baseproduct/miniserv.conf >/dev/null 2>&1
 	if [ "\$?" = 0 ]; then
 		# Package is being removed, and no new version of webmin