Revision 6dc2ab71 devflow/flow.py
b/devflow/flow.py | ||
---|---|---|
7 | 7 |
from argparse import ArgumentParser |
8 | 8 |
|
9 | 9 |
os.environ["GIT_PYTHON_TRACE"] = "full" |
10 |
from devflow import utils, versioning |
|
10 |
from devflow import utils, versioning, RC_RE
|
|
11 | 11 |
from devflow.version import __version__ |
12 | 12 |
from devflow.autopkg import call |
13 | 13 |
from devflow.ui import query_action, query_user, query_yes_no |
... | ... | |
307 | 307 |
edit_action = partial(self.edit_changelog, upstream_branch, "develop") |
308 | 308 |
self.check_edit_changelog(edit_action, args, default=True) |
309 | 309 |
|
310 |
vcs = utils.get_vcs_info() |
|
311 |
release_version = versioning.get_base_version(vcs) |
|
312 |
if re.match('.*'+RC_RE, release_version): |
|
313 |
new_version = re.sub(RC_RE, '', release_version) |
|
314 |
versioning._bump_version(new_version, vcs) |
|
315 |
|
|
310 | 316 |
#merge to master |
311 | 317 |
self._merge_branches(master, upstream_branch) |
312 | 318 |
self._merge_branches(debian_master, debian_branch) |
Also available in: Unified diff