Merge lp:~gandelman-a/cloud-archive-utils/release_pocket into lp:cloud-archive-utils

Proposed by Adam Gandelman
Status: Merged
Merged at revision: 12
Proposed branch: lp:~gandelman-a/cloud-archive-utils/release_pocket
Merge into: lp:cloud-archive-utils
Diff against target: 35 lines (+4/-3)
2 files modified
cloudarchive/backport.py (+2/-1)
cloudarchive/utils.py (+2/-2)
To merge this branch: bzr merge lp:~gandelman-a/cloud-archive-utils/release_pocket
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+179423@code.launchpad.net

Description of the change

Ensures version queries and backports from the archive come from the release pocket and not the proposed.

To post a comment you must log in.
Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cloudarchive/backport.py'
2--- cloudarchive/backport.py 2013-07-04 21:57:27 +0000
3+++ cloudarchive/backport.py 2013-08-09 12:26:20 +0000
4@@ -45,7 +45,8 @@
5 try:
6 Logger.normal('Looking for package %s in %s',
7 package, SOURCE_RELEASE[release])
8- spph = archive.getSourcePackage(package, SOURCE_RELEASE[release])
9+ spph = archive.getSourcePackage(package, SOURCE_RELEASE[release],
10+ pocket='Release')
11 version = spph.getVersion()
12 component = spph.getComponent()
13 Logger.normal('Found version: %s', version)
14
15=== modified file 'cloudarchive/utils.py'
16--- cloudarchive/utils.py 2013-07-04 21:19:19 +0000
17+++ cloudarchive/utils.py 2013-08-09 12:26:20 +0000
18@@ -37,7 +37,7 @@
19 distro = ppa.distribution.getSeries(name_or_version=release)
20 out = {}
21 for pkg in ppa.getPublishedSources(distro_series=distro,
22- status='Published'):
23+ status='Published'):
24 out[pkg.source_package_name] = pkg.source_package_version
25 return out
26
27@@ -47,7 +47,7 @@
28 get_lp()
29 archive = Distribution('ubuntu').getArchive()
30 try:
31- spph = archive.getSourcePackage(package, release)
32+ spph = archive.getSourcePackage(package, release, pocket='Release')
33 except (SeriesNotFoundException, PackageNotFoundException):
34 return None
35 else:

Subscribers

People subscribed via source and target branches