make builds from release+hotfix branches be uploaded to production-proposed-updates

diff --git a/debian_build.py b/debian_build.py
index 6d073db235c78a55ad7e9fda3e072934cbf2d5cb..14f3d0b1b02eee980b398c7b7d8b34b0a779bb62 100755 (executable)
--- a/debian_build.py
+++ b/debian_build.py
@@ -341,7 +341,7 @@ if __name__ == '__main__':
     if options.distribution in ('testing', 'staging', 'unstable', 'pre-staging','experimental'):
         daily_date = datetime.datetime.now().strftime('%Y%m%d%H%M%S')
 
-        if options.distribution in ('testing', 'staging'):
+        if GIT_BRANCH_NAME.startswith('release') or GIT_BRANCH_NAME.startswith('hotfix'):
             version = '%s~rc%s' %(version, daily_date)
         else:
             version = '%s~develop%s' %(version, daily_date)
@@ -399,9 +399,7 @@ if __name__ == '__main__':
       pb_suite='experimental'
     elif options.distribution in ('unstable' , 'pre-staging'):
       pb_suite='pre-staging'
-    elif options.distribution in ('testing', 'staging'):
-      pb_suite='staging'
-    elif options.distribution in ('stable', 'stable-proposed-updates', 'production', 'production-proposed-updates'):
+    elif GIT_BRANCH_NAME.startswith('release') or GIT_BRANCH_NAME.startswith('hotfix') or options.distribution in ('stable', 'stable-proposed-updates', 'production', 'production-proposed-updates'):
       pb_suite='production-proposed-updates'
        
     gbp = git_buildpackage.GitBuildPackage(