Merge ~barryprice/layer-snap/+git/layer-snap:master into layer-snap:master

Proposed by Barry Price
Status: Merged
Approved by: Barry Price
Approved revision: 6695b38b00b8c71a197e87d3512344a66f30af54
Merged at revision: c5e9b6acd1098e946353322b1468dec30e60c6f0
Proposed branch: ~barryprice/layer-snap/+git/layer-snap:master
Merge into: layer-snap:master
Diff against target: 19 lines (+0/-8)
1 file modified
reactive/snap.py (+0/-8)
Reviewer Review Type Date Requested Status
Joel Sing (community) +1 Approve
Laurent Sesquès Approve
Review via email: mp+415361@code.launchpad.net

Commit message

The relevant bug has been resolved, and Xenial is EOL to boot.

Via LP:1628289:

> <mwhudson> My understand of the status is that snapd grew its own code for mounting snaps via fuse, which would make this MIR unnecessary.
> <pedronis> Indeed snapd carries this on its own.

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Laurent Sesquès (sajoupa) wrote :

LGTM

review: Approve
Revision history for this message
Joel Sing (jsing) wrote :

LGTM

review: Approve (+1)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision c5e9b6acd1098e946353322b1468dec30e60c6f0

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/reactive/snap.py b/reactive/snap.py
index 1fda7b7..2220648 100644
--- a/reactive/snap.py
+++ b/reactive/snap.py
@@ -158,14 +158,6 @@ def ensure_snapd():
158 cmd.append("systemd")158 cmd.append("systemd")
159 subprocess.check_call(cmd, universal_newlines=True)159 subprocess.check_call(cmd, universal_newlines=True)
160160
161 # Work around lp:1628289. Remove this stanza once snapd depends
162 # on the necessary package and snaps work in lxd xenial containers
163 # without the workaround.
164 if host.is_container() and not shutil.which("squashfuse"):
165 os.environ["DEBIAN_FRONTEND"] = "noninteractive"
166 cmd = ["apt-get", "install", "-y", "squashfuse", "fuse"]
167 subprocess.check_call(cmd, universal_newlines=True)
168
169161
170def proxy_settings():162def proxy_settings():
171 proxy_vars = ("http_proxy", "https_proxy")163 proxy_vars = ("http_proxy", "https_proxy")

Subscribers

People subscribed via source and target branches