Merge branch 'release-0.10'

devflow/autopkg.py

@@ -166,6 +166,7 @@ def main():
 
     # Get current branch name and type and check if it is a valid one
     branch = original_repo.head.reference.name
+    branch = utils.undebianize(branch)
     branch_type_str = utils.get_branch_type(branch)
 
     if branch_type_str not in BRANCH_TYPES.keys():

devflow/utils.py

@@ -184,3 +184,11 @@ def get_branch_type(branch_name):
 
 def version_to_tag(version):
     return version.replace("~", "")
+
+def undebianize(branch):
+    if branch == "debian":
+        return "master"
+    elif branch.startswith("debian-"):
+        return branch.replace("debian-", "")
+    else:
+        return branch