Pretty-print some error messages

[auto-debuild.git] / auto_debuild.py

diff --git a/auto_debuild.py b/auto_debuild.py
index bb4387e9dc1493ab50576858a2bbdddb75b37468..17edd4ee2f3256aa1def1691d675c88f5ff229b5 100755 (executable)
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -30,7 +30,9 @@ class RulesFile:
        def write(self, f):
                print >>f, "#!/usr/bin/make -f"
                print >>f, ""
-               print >>f, "%:"
+               print >>f, ".PHONY: build" # there may be a directory called "build"
+               print >>f, ""
+               print >>f, "build %:" # need to mention "build" here again explicitly
                print >>f, '\t'+self.env2str()+' dh $@ '+safeCall(*self.dh)
                for rule in self.rules:
                        print >>f, ""
@@ -40,7 +42,7 @@ class RulesFile:
 
 # build-system specific part of rules file
 def cmakeRules(config):
-       buildDir = config.get('buildDir', 'build.dir') # "build" is not a good idea, as that's also the name of a target...
+       buildDir = config.get('buildDir', 'build')
        srcDir = os.getcwd()
        r = RulesFile()
        r.dh += ["--buildsystem=cmake", "--builddirectory="+buildDir] # dh parameters
@@ -201,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)