Merge ~d0ugal/maas-images:lzma into maas-images:master

Proposed by Dougal Matthews
Status: Merged
Merged at revision: ad2b75c92aca50057cb2900146dcb4580f546c22
Proposed branch: ~d0ugal/maas-images:lzma
Merge into: maas-images:master
Diff against target: 23 lines (+1/-5)
1 file modified
meph2/commands/dpkg.py (+1/-5)
Reviewer Review Type Date Requested Status
Alberto Donato (community) Approve
Review via email: mp+387738@code.launchpad.net

Commit message

lzma was added to the stdlib in Python 3.3

The backport is no longer needed and removing the try/except shows the
real error if liblzma-dev was missing when Python was compiled.

To post a comment you must log in.
Revision history for this message
Alberto Donato (ack) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/meph2/commands/dpkg.py b/meph2/commands/dpkg.py
index 35ea5eb..e6c1d0e 100644
--- a/meph2/commands/dpkg.py
+++ b/meph2/commands/dpkg.py
@@ -2,6 +2,7 @@ import shutil
2import subprocess2import subprocess
3import hashlib3import hashlib
4import io4import io
5import lzma
5import os6import os
6import re7import re
7import sys8import sys
@@ -11,11 +12,6 @@ import glob
1112
12from meph2.url_helper import geturl13from meph2.url_helper import geturl
1314
14try:
15 import lzma
16except ImportError:
17 from backports import lzma
18
19# Cache packages15# Cache packages
20_packages = {}16_packages = {}
2117

Subscribers

People subscribed via source and target branches