Revision d3af231f
b/devflow/autopkg.py | ||
---|---|---|
237 | 237 |
# Update the version files |
238 | 238 |
versioning.update_version() |
239 | 239 |
|
240 |
|
|
241 |
if not options.sign: |
|
242 |
sign_tag_opt = None |
|
243 |
elif options.keyid: |
|
244 |
sign_tag_opt = "-u=%s" % options.keyid |
|
245 |
elif mode == "release": |
|
246 |
sign_tag_opt = "-s" |
|
247 |
else: |
|
248 |
sign_tag_opt = None |
|
249 |
|
|
240 | 250 |
# Tag branch with python version |
241 | 251 |
branch_tag = python_version |
252 |
tag_message = "%s version %s" % (mode.capitalize(), python_version) |
|
242 | 253 |
try: |
243 |
repo.git.tag(branch_tag, branch) |
|
254 |
repo.git.tag(branch_tag, branch, sign_tag_opt, "-m=%s" % tag_message)
|
|
244 | 255 |
except GitCommandError: |
245 | 256 |
# Tag may already exist, if only the debian branch has changed |
246 | 257 |
pass |
... | ... | |
280 | 291 |
repo.git.commit("-s", "-a", m="Bump version to %s" % debian_version) |
281 | 292 |
# Tag debian branch |
282 | 293 |
debian_branch_tag = "debian/" + utils.version_to_tag(debian_version) |
294 |
tag_message = "%s version %s" % (mode.capitalize(), debian_version) |
|
283 | 295 |
if mode == "release": |
284 |
repo.git.tag(debian_branch_tag) |
|
296 |
repo.git.tag(debian_branch_tag, sign_tag_opt, "-m=%s" % tag_message)
|
|
285 | 297 |
|
286 | 298 |
# Add version.py files to repo |
287 | 299 |
call("grep \"__version_vcs\" -r . -l -I | xargs git add -f") |
Also available in: Unified diff