Juju Charms Collection
swift-proxy package

Merge lp:~ahasenack/charms/precise/swift-proxy/handle-ppa-in-origin into lp:~charmers/charms/precise/swift-proxy/trunk

  1. Precise Pangolin (12.04)
  2. handle-ppa-in-origin
  3. Merge into trunk
Proposed by Andreas Hasenack
Status: Merged
Merged at revision: 37
Proposed branch: lp:~ahasenack/charms/precise/swift-proxy/handle-ppa-in-origin
Merge into: lp:~charmers/charms/precise/swift-proxy/trunk
Diff against target: 14 lines (+2/-2)
1 file modified
hooks/lib/openstack_common.py (+2/-2)
To merge this branch: bzr merge lp:~ahasenack/charms/precise/swift-proxy/handle-ppa-in-origin
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+148310@code.launchpad.net

Description of the change

This fixes get_os_codename_install_source() to also handle a "ppa:" style source. I could have parsed the string, but I'm afraid of crazy KeyErrors and just looking for the openstack release sounded safer, in the same way as is done for "deb" lines already.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/lib/openstack_common.py'
2--- hooks/lib/openstack_common.py 2013-02-13 17:08:00 +0000
3+++ hooks/lib/openstack_common.py 2013-02-13 20:22:29 +0000
4@@ -68,8 +68,8 @@
5 ca_rel = ca_rel.split('%s-' % ubuntu_rel)[1].split('/')[0]
6 return ca_rel
7
8- # Best guess match based on deb string provided
9- if src.startswith('deb'):
10+ # Best guess match based on deb or ppa provided strings
11+ if src.startswith('deb') or src.startswith('ppa'):
12 for k, v in openstack_codenames.iteritems():
13 if v in src:
14 return v

Subscribers

People subscribed via source and target branches