From b6fc6eb7df538eb1590944760beed6d8d859953a Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Tue, 7 Aug 2012 10:20:29 +0000
Subject: [PATCH] Pretty-print some error messages

---
 auto_debuild.py | 48 +++++++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/auto_debuild.py b/auto_debuild.py
index c827a12..17edd4e 100755
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -203,23 +203,33 @@ def buildDebianPackage(config):
 ###################################################################
 # if we are called directly as script
 if __name__ == "__main__":
-	import imp
-	# get config
-	config = imp.load_source('config', 'auto-debuild.conf').__dict__
-	os.remove('auto-debuild.confc')
-	# generate debian files
-	if os.path.exists('debian'):
-		if raw_input("A debian folder already exists, to you want to remove it (y/N)? ").lower() != "y":
-			sys.exit(1)
-		shutil.rmtree('debian')
-	files = createDebianFiles(config)
-	# check if a file is overwritten
-	for file in files:
-		if os.path.exists(file):
-			if raw_input("Do you want to overwrite %s (y/N)? " % file).lower() != "y":
+	try:
+		import imp
+		# get config
+		config = imp.load_source('config', 'auto-debuild.conf').__dict__
+		os.remove('auto-debuild.confc')
+		# generate debian files
+		if os.path.exists('debian'):
+			if raw_input("A debian folder already exists, to you want to remove it (y/N)? ").lower() != "y":
 				sys.exit(1)
-	# run compilation
-	buildDebianPackage(config)
-	# install files
-	print "Installing created deb files..."
-	subprocess.check_call(['sudo', 'dpkg', '--install'] + files)
+			shutil.rmtree('debian')
+		files = createDebianFiles(config)
+		# check if a file is overwritten
+		for file in files:
+			if os.path.exists(file):
+				if raw_input("Do you want to overwrite %s (y/N)? " % file).lower() != "y":
+					sys.exit(1)
+		# run compilation
+		buildDebianPackage(config)
+		# install files
+		print "Installing created deb files..."
+		subprocess.check_call(['sudo', 'dpkg', '--install'] + files)
+	except (subprocess.CalledProcessError, KeyboardInterrupt) as e: # for some exceptions, a stackrace is usually pointless
+		print >> sys.stderr
+		print >> sys.stderr
+		if isinstance(e, KeyboardInterrupt): # str(e) would be the empty string
+			print >> sys.stderr, "Interruped by user"
+		else:
+			print >> sys.stderr, "Error during package creation: %s" % str(e)
+		print >> sys.stderr
+		sys.exit(1)
-- 
2.30.2