maas-images

Merge lp:~oddbloke/maas-images/fix-yakkety-builds into lp:maas-images

  1. fix-yakkety-builds
  2. Merge into maas-ephemerals
Proposed by Dan Watkins
Status: Merged
Merged at revision: 317
Proposed branch: lp:~oddbloke/maas-images/fix-yakkety-builds
Merge into: lp:maas-images
Diff against target: 23 lines (+5/-1)
1 file modified
meph2/commands/dpkg.py (+5/-1)
To merge this branch: bzr merge lp:~oddbloke/maas-images/fix-yakkety-builds
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+301641@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

Lgtm!!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'meph2/commands/dpkg.py'
2--- meph2/commands/dpkg.py 2016-07-29 22:28:22 +0000
3+++ meph2/commands/dpkg.py 2016-08-01 12:25:24 +0000
4@@ -4,7 +4,6 @@
5 import subprocess
6 import hashlib
7 import io
8-import lzma
9 import os
10 import re
11 import sys
12@@ -14,6 +13,11 @@
13
14 from meph2.url_helper import geturl
15
16+try:
17+ import lzma
18+except ImportError:
19+ from backports import lzma
20+
21
22 def get_distro_release():
23 """Returns the release name for the running distro."""

Subscribers

People subscribed via source and target branches