Merge ~hloeung/layer-snap:master into ~stub/layer-snap:master

Proposed by Haw Loeung
Status: Merged
Merged at revision: 9c69a33ea0586ac68a4e47d6b55b3a0374b96b26
Proposed branch: ~hloeung/layer-snap:master
Merge into: ~stub/layer-snap:master
Diff against target: 19 lines (+7/-1)
1 file modified
lib/charms/layer/snap.py (+7/-1)
Reviewer Review Type Date Requested Status
Stuart Bishop Pending
Review via email: mp+381417@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/charms/layer/snap.py b/lib/charms/layer/snap.py
2index f760d69..28af4e4 100644
3--- a/lib/charms/layer/snap.py
4+++ b/lib/charms/layer/snap.py
5@@ -382,7 +382,13 @@ def _resource_get(snapname):
6 def get_available_refreshes():
7 '''Return a list of snaps which have refreshes available.
8 '''
9- out = subprocess.check_output(['snap', 'refresh', '--list']).decode('utf8')
10+ try:
11+ out = subprocess.check_output(['snap', 'refresh', '--list']).decode('utf8')
12+ except subprocess.CalledProcessError:
13+ # If snap refresh fails for whatever reason, we should just return no
14+ # refreshes available - LP:1869630.
15+ return []
16+
17 if out == 'All snaps up to date.':
18 return []
19 else:

Subscribers

People subscribed via source and target branches

to all changes: