[Merge] ~alfonsosanchezbeato/network-manager:add-connectivity-check into network-manager:snap-1.10

Tony Espy espy at canonical.com
Fri Dec 21 22:57:00 UTC 2018



Diff comments:

> diff --git a/snap/hooks/install b/snap/hooks/install
> deleted file mode 100755
> index 8f4e7ca..0000000
> --- a/snap/hooks/install
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -#!/bin/sh -e

This hook is also used to prevent installation on classic desktop systems, not just Ubuntu Core 16!

> -
> -. "$SNAP"/meta/hooks/utils.sh
> -
> -target=$(get_target_system)
> -
> -if [ "$target" != "18" ] ; then
> -    echo "This snap is only supported on Ubuntu Core 18."
> -    exit 1
> -fi
> -
> diff --git a/snap/hooks/post-refresh b/snap/hooks/post-refresh
> deleted file mode 100755
> index 8f4e7ca..0000000
> --- a/snap/hooks/post-refresh
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -#!/bin/sh -e

This hook is also used to prevent refresh on classic desktop systems, not just Ubuntu Core 16!

> -
> -. "$SNAP"/meta/hooks/utils.sh
> -
> -target=$(get_target_system)
> -
> -if [ "$target" != "18" ] ; then
> -    echo "This snap is only supported on Ubuntu Core 18."
> -    exit 1
> -fi
> -
> diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
> index e43dea0..d9e1363 100644
> --- a/snap/snapcraft.yaml
> +++ b/snap/snapcraft.yaml
> @@ -85,7 +80,6 @@ parts:
>    networkmanager:
>      plugin: autotools
>      source: .
> -    build-attributes: [no-system-libraries]

How are you building the snap? I'm still using 2.43.1 due to some issues with snapcraft 3.x. This attribute is still supported by 2.43.1, so I'd prefer to keep it for now, unless it's breaking snapcraft 3.x builds.

>      build-packages:
>        - intltool
>        - libdbus-glib-1-dev


-- 
https://code.launchpad.net/~alfonsosanchezbeato/network-manager/+git/network-manager/+merge/361245
Your team Network-manager is requested to review the proposed merge of ~alfonsosanchezbeato/network-manager:add-connectivity-check into network-manager:snap-1.10.



More information about the ubuntu-desktop mailing list