update gitignore for python 3

[mass-build.git] / build_system.py

diff --git a/build_system.py b/build_system.py
index 63a236ef5431f7a6a781b07b6abed706af4b2ac4..634f73d671bd5751b678a62a1d9f2ce7655f7e37 100644 (file)
--- a/build_system.py
+++ b/build_system.py
@@ -67,7 +67,7 @@ class CMake:
                self.restoreEnv('XDG_CONFIG_DIRS', oldXDGConfigDirs)
                # if asked to do so, wait
                if waitAfterConfig:
-                       raw_input('Configuration done. Hit "Enter" to build the project. ')
+                       input('Configuration done. Hit "Enter" to build the project. ')
                # run compilation
                jobs = int(self.config['jobs'])
                subprocess.check_call(self.config.get('buildCmdPrefix', []) + ['make', '-j'+str(jobs)])
@@ -99,7 +99,7 @@ try:
                                'name': self.config['debName'],
                                'email': self.config['debEMail'],
                                'parallelJobs': self.config['jobs'],
-                               'version': versionName,
+                               'version': versionName + self.config.get('versionSuffix', ''),
                                'waitAfterConfig': waitAfterConfig,
                        }
                        # copy some more optional configuration