Merge ~alexmurray/ubuntu-security-tools:umt-upload-check-and-override-missing-destination-series into ubuntu-security-tools:master

Proposed by Alex Murray
Status: Merged
Merged at revision: 626789d56f4b778ef4e46e827cfc485a7d6aa323
Proposed branch: ~alexmurray/ubuntu-security-tools:umt-upload-check-and-override-missing-destination-series
Merge into: ubuntu-security-tools:master
Diff against target: 16 lines (+5/-0)
1 file modified
build-tools/umt (+5/-0)
Reviewer Review Type Date Requested Status
Seth Arnold Approve
Review via email: mp+428426@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Seth Arnold (seth-arnold) wrote :

What would you think about modifying the 'Assuming ..' output to show the new string in its entirety, rather than just the tail? It'd be nice if we could copy-paste what's on screen to avoid seeing this message the next run. :)

Thanks

Revision history for this message
Alex Murray (alexmurray) wrote :

Thanks for the review Seth - good idea re showing the full destination - I updated it with https://git.launchpad.net/~alexmurray/ubuntu-security-tools/commit/?id=626789d56f4b778ef4e46e827cfc485a7d6aa323

Revision history for this message
Seth Arnold (seth-arnold) wrote :

thanks :) nothing else stood out to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/build-tools/umt b/build-tools/umt
2index 0a62fd8..c268d14 100755
3--- a/build-tools/umt
4+++ b/build-tools/umt
5@@ -4369,6 +4369,11 @@ def _compare_versions(v1, comp, v2):
6 def validate_changes_file(changes_file, details, destination, use_aptcache, force):
7 '''Validate details from a changes file before uploading.'''
8
9+ # ensure destination specifies a valid series
10+ if destination not in ["ubuntu", "debian"] and ":" not in destination:
11+ warn("Missing series from PPA destination '%s'. Overriding as '%s:%s'" % (destination, destination, details['distribution']))
12+ destination = destination + ":" + details['distribution']
13+
14 print("Destination is: %s" % destination)
15 if destination == 'ubuntu' or re.search('security*', destination):
16 print("Validating %s version %s ..." % (details['source'], details['base_version']))

Subscribers

People subscribed via source and target branches