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

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
=== modified file 'meph2/commands/dpkg.py'
--- meph2/commands/dpkg.py 2016-07-29 22:28:22 +0000
+++ meph2/commands/dpkg.py 2016-08-01 12:25:24 +0000
@@ -4,7 +4,6 @@
4import subprocess4import subprocess
5import hashlib5import hashlib
6import io6import io
7import lzma
8import os7import os
9import re8import re
10import sys9import sys
@@ -14,6 +13,11 @@
1413
15from meph2.url_helper import geturl14from meph2.url_helper import geturl
1615
16try:
17 import lzma
18except ImportError:
19 from backports import lzma
20
1721
18def get_distro_release():22def get_distro_release():
19 """Returns the release name for the running distro."""23 """Returns the release name for the running distro."""

Subscribers

People subscribed via source and target branches