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
1diff --git a/meph2/commands/dpkg.py b/meph2/commands/dpkg.py
2index 35ea5eb..e6c1d0e 100644
3--- a/meph2/commands/dpkg.py
4+++ b/meph2/commands/dpkg.py
5@@ -2,6 +2,7 @@ import shutil
6 import subprocess
7 import hashlib
8 import io
9+import lzma
10 import os
11 import re
12 import sys
13@@ -11,11 +12,6 @@ import glob
14
15 from meph2.url_helper import geturl
16
17-try:
18- import lzma
19-except ImportError:
20- from backports import lzma
21-
22 # Cache packages
23 _packages = {}
24

Subscribers

People subscribed via source and target branches