pkgme

Merge lp:~jml/pkgme/lucid-proof into lp:pkgme

  1. lucid-proof
  2. Merge into trunk
Proposed by Jonathan Lange
Status: Merged
Approved by: Jonathan Lange
Approved revision: 94
Merged at revision: 96
Proposed branch: lp:~jml/pkgme/lucid-proof
Merge into: lp:pkgme
Diff against target: 15 lines (+4/-1)
1 file modified
pkgme/package_files.py (+4/-1)
To merge this branch: bzr merge lp:~jml/pkgme/lucid-proof
Reviewer Review Type Date Requested Status
Jonathan Lange Approve
Review via email: mp+88201@code.launchpad.net

Commit message

Correctly import python-debian on lucid.

Description of the change

On lucid, python-debian's package is called "debian_bundle", not "debian". This patch tries to import "debian" and if that fails tries to import "debian_bundle".

To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

Self-approving as it's a trivial patch.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pkgme/package_files.py'
2--- pkgme/package_files.py 2012-01-10 14:48:35 +0000
3+++ pkgme/package_files.py 2012-01-11 12:45:26 +0000
4@@ -1,7 +1,10 @@
5 import datetime
6 import os
7
8-from debian import changelog
9+from testtools import try_imports
10+
11+# In lucid, python-debian exports its package as 'debian_bundle'.
12+changelog = try_imports(['debian.changelog', 'debian_bundle.changelog'])
13
14 from pkgme.info_elements import (
15 ApplicationName,

Subscribers

People subscribed via source and target branches