X-Git-Url: https://git.ralfj.de/auto-debuild.git/blobdiff_plain/e82d2ebfa5c26c1e60a334c9f048cf9661f019f5..b6fc6eb7df538eb1590944760beed6d8d859953a:/auto_debuild.py 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)