add support for building pre-staging branches (commented out) and simplify code a bit

diff --git a/debian_build.py b/debian_build.py
index ef4a65fbd4a58bc0d4a2c1d8a66469f1187c6f0a..d797bbca6873f1e9fc512a4a66e30783c4e83441 100755 (executable)
--- a/debian_build.py
+++ b/debian_build.py
@@ -353,18 +353,19 @@ if __name__ == '__main__':
             # these uploads should go to a different repo:
             DPUT_OPTIONS = DPUT_OPTIONS_DEV
         else:
-            if GIT_REPO_PATH.startswith('/srv/git/dev/'):
-                if GIT_BRANCH_NAME == 'pre-staging':
-                    version = '%s~develop%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit[0:7])
-                    changelog_distro = 'pre-staging'
-                else:
-                    # use shorter date because we can
-                    daily_date = datetime.datetime.now().strftime('%Y%m%d')
-                    version = '%s~alpha%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit[0:7])
-                    changelog_distro = 'unstable'
-            else:
-                    version = '%s~develop%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit[0:7])
-                    changelog_distro = 'pre-staging'
+            #FIXME: enable this once Florian acks.
+            #if GIT_REPO_PATH.startswith('/srv/git/dev/'):
+            #    if GIT_BRANCH_NAME == 'pre-staging':
+            #        version = '%s~develop%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit[0:7])
+            #        changelog_distro = 'pre-staging'
+            #    else:
+            #        # use shorter date because we can
+            #        daily_date = datetime.datetime.now().strftime('%Y%m%d')
+            #        version = '%s~alpha%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit[0:7])
+            #        changelog_distro = 'unstable'
+            #else:
+            version = '%s~develop%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit[0:7])
+            changelog_distro = 'pre-staging'
 
         new_log = 'Generated by jenkins build of %s' % current_commit