Ondrej Kubik

Merge ~ondrak/+git/snappy-discover:master into ~jocave/+git/snappy-discover:master

  1. Git
  2. lp:~ondrak/+git/snappy-discover
  3. master
  4. Merge into master
Proposed by Ondrej Kubik
Status: Merged
Approved by: Jonathan Cave
Approved revision: 4798861b28929cd13e93e27fc9329579ccc0a925
Merge reported by: Jonathan Cave
Merged at revision: 4798861b28929cd13e93e27fc9329579ccc0a925
Proposed branch: ~ondrak/+git/snappy-discover:master
Merge into: ~jocave/+git/snappy-discover:master
Diff against target: 37 lines (+7/-3)
1 file modified
snap/snapcraft.yaml (+7/-3)
Reviewer Review Type Date Requested Status
Jonathan Cave Approve
Review via email: mp+412354@code.launchpad.net

Commit message

Bring this beauty to 2021

To post a comment you must log in.
Revision history for this message
Jonathan Cave (jocave) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
2index 7b1cf95..08e575f 100644
3--- a/snap/snapcraft.yaml
4+++ b/snap/snapcraft.yaml
5@@ -1,14 +1,18 @@
6 name: snappy-discover
7-version: '1'
8+version: '1.2'
9 summary: Discover snappy devices on the local network
10 description: |
11 This snap is intended to be used with the 'avahi' snap. Zeroconf is used
12 to discover devices advertising a ssh service with and additional txt-record
13 that identifies the OS as snappy.
14
15+base: core20
16 grade: stable
17 confinement: strict
18
19+environment:
20+ PYTHONPATH: $SNAP/usr/lib/python3/dist-packages
21+
22 parts:
23 snappy-discover:
24 plugin: dump
25@@ -19,10 +23,10 @@ parts:
26 plugin: nil
27 stage-packages:
28 - python3-zeroconf
29- snap:
30+ stage:
31 - -usr/share
32
33 apps:
34 snappy-discover:
35- command: snappy-discover.py
36+ command: bin/snappy-discover.py
37 plugs: [network]

Subscribers

People subscribed via source and target branches

to all changes: