fix the -c/--config argument; adapt to the debian folder possibly being a symlink

diff --git a/build_system.py b/build_system.py
index 9dceb7df7e689e7782a69ef3fa9462f2ff5e953e..1697dc63813d326b9855a2a7a41dc98c3f5d1909 100644 (file)
--- 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)
                                        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)
                        files = auto_debuild.createDebianFiles(autoDebuildConfig)
                        # build package(s)
                        auto_debuild.buildDebianPackage(autoDebuildConfig)

diff --git a/mass_build.py b/mass_build.py
index e327b7ee2e91c23ea86b6226f949813de281c5ae..b5d581702386aaee54d751b56535e872ec821e8f 100755 (executable)
--- 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')
 
 # 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",
                     dest="config", default="mass-build.conf",
                     help="mass-build config file")
 parser.add_argument("--reconfigure",