ubuntu-archive-tools

Merge lp:~wgrant/ubuntu-archive-tools/ddebs into lp:ubuntu-archive-tools

  1. ddebs
  2. Merge into trunk
Proposed by William Grant
Status: Merged
Merged at revision: 721
Proposed branch: lp:~wgrant/ubuntu-archive-tools/ddebs
Merge into: lp:ubuntu-archive-tools
Diff against target: 65 lines (+10/-5)
4 files modified
change-override (+2/-1)
kernel-overrides (+2/-1)
promote-to-release (+3/-1)
remove-package (+3/-2)
To merge this branch: bzr merge lp:~wgrant/ubuntu-archive-tools/ddebs
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+166456@code.launchpad.net

Commit message

Teach overrides and deletions to skip debug publications. They follow the corresponding non-debug publication and cannot be modified independently.

Description of the change

ddebs will soon be published in the primary archive (albeit not appearing on the archive disk just yet). They can't be overridden or deleted directly, so the archive tools need to know to ignore them when performing those operations.

This relies on a new BPPH.is_debug attribute which isn't quite on production yet.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'change-override'
2--- change-override 2012-12-13 14:50:11 +0000
3+++ change-override 2013-05-30 07:58:28 +0000
4@@ -44,7 +44,8 @@
5 elif not options.source_only:
6 for binary in lputils.find_latest_published_binaries(
7 options, package):
8- yield "binary", binary
9+ if not binary.is_debug:
10+ yield "binary", binary
11
12
13 def change_overrides(options, packages):
14
15=== modified file 'kernel-overrides'
16--- kernel-overrides 2013-05-02 19:12:59 +0000
17+++ kernel-overrides 2013-05-30 07:58:28 +0000
18@@ -64,7 +64,8 @@
19 """If getPublishedBinaries times out, fall back to doing it by hand."""
20 try:
21 for binary in source.getPublishedBinaries():
22- yield binary
23+ if not binary.is_debug:
24+ yield binary
25 except ServerError as e:
26 if e.response.status != 503:
27 raise
28
29=== modified file 'promote-to-release'
30--- promote-to-release 2013-05-03 19:10:48 +0000
31+++ promote-to-release 2013-05-30 07:58:28 +0000
32@@ -88,7 +88,9 @@
33 file=sys.stderr)
34 else:
35 for bpph in proposed_source.getPublishedBinaries():
36- if bpph.architecture_specific:
37+ if bpph.is_debug:
38+ continue
39+ elif bpph.architecture_specific:
40 if architecture != bpph.distro_arch_series.architecture_tag:
41 continue
42 else:
43
44=== modified file 'remove-package'
45--- remove-package 2013-05-20 11:08:00 +0000
46+++ remove-package 2013-05-30 07:58:28 +0000
47@@ -31,7 +31,8 @@
48 def find_removables(options, package):
49 if options.binaryonly:
50 for binary in lputils.find_latest_published_binaries(options, package):
51- yield binary, True
52+ if not binary.is_debug:
53+ yield binary, True
54 else:
55 source = lputils.find_latest_published_source(options, package)
56 yield source, True
57@@ -110,7 +111,7 @@
58 options, args = parser.parse_args()
59
60 options.launchpad = Launchpad.login_with(
61- "remove-package", options.launchpad_instance)
62+ "remove-package", options.launchpad_instance, version="devel")
63 lputils.setup_location(options)
64
65 if options.removal_comment is None:

Subscribers

People subscribed via source and target branches