From 63b4911248113d04baa0b6af5fdb4e8d4c264738 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 27 Oct 2013 21:41:29 +0100 Subject: [PATCH] fix the -c/--config argument; adapt to the debian folder possibly being a symlink --- build_system.py | 3 +-- mass_build.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build_system.py b/build_system.py index 9dceb7d..1697dc6 100644 --- a/build_system.py +++ b/build_system.py @@ -110,8 +110,7 @@ try: autoDebuildConfig[option] = self.config[option] # create Debian files os.chdir(self.sourceFolder) - if os.path.isdir('debian'): # clean previous build attempts - shutil.rmtree('debian') + auto_debuild.deleteDebianFolder() files = auto_debuild.createDebianFiles(autoDebuildConfig) # build package(s) auto_debuild.buildDebianPackage(autoDebuildConfig) diff --git a/mass_build.py b/mass_build.py index e327b7e..b5d5817 100755 --- a/mass_build.py +++ b/mass_build.py @@ -60,7 +60,7 @@ class Project: # read command-line arguments parser = argparse.ArgumentParser(description='Update and build a bunch of stuff') -parser.add_argument("-c, --config", +parser.add_argument("-c", "--config", dest="config", default="mass-build.conf", help="mass-build config file") parser.add_argument("--reconfigure", -- 2.30.2