Revision 18a2af6d
b/devflow/utils.py | ||
---|---|---|
34 | 34 |
import os |
35 | 35 |
import git |
36 | 36 |
import sh |
37 |
import re |
|
37 | 38 |
from collections import namedtuple |
38 | 39 |
from configobj import ConfigObj |
39 | 40 |
|
... | ... | |
123 | 124 |
if _get_branch(deb_branch): |
124 | 125 |
return deb_branch |
125 | 126 |
# Check without distribution |
126 |
deb_branch = deb_branch.rstrip("-" + distribution)
|
|
127 |
deb_branch = re.sub("-" + distribution + "$", "", deb_branch)
|
|
127 | 128 |
if _get_branch(deb_branch): |
128 | 129 |
return deb_branch |
129 | 130 |
branch_type = BRANCH_TYPES[get_branch_type(branch)] |
Also available in: Unified diff