Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:update-dnsmasq into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:snap-1.10

Proposed by Alfonso Sanchez-Beato
Status: Merged
Approved by: Alfonso Sanchez-Beato
Approved revision: 0802499a2007056455326cc51d4e301c611bb8d5
Merged at revision: f059028e0fd6e0d57c4043493f6d9ed93b67b4ac
Proposed branch: ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:update-dnsmasq
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:snap-1.10
Diff against target: 29 lines (+3/-3)
2 files modified
run-tests.sh (+2/-2)
snap/snapcraft.yaml (+1/-1)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Approve
Review via email: mp+400597@code.launchpad.net

Commit message

Update dnsmasq to applied/2.79-1ubuntu0.3

Description of the change

Update dnsmasq to applied/2.79-1ubuntu0.3

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/run-tests.sh b/run-tests.sh
2index 7f827b6..3fd257c 100755
3--- a/run-tests.sh
4+++ b/run-tests.sh
5@@ -87,9 +87,9 @@ fi
6 backends="--backends="
7 separator=""
8 while read -r be; do
9- backends=$backends$separator${be##*.}
10+ backends=$backends$separator$be
11 separator=,
12-done < <(yq r spread.yaml --printMode p 'backends.qemu.systems[*].*')
13+done < <(yq eval '.backends.qemu.systems[]' spread.yaml | sed -e '/^ /d' -e 's/://')
14
15 echo "INFO: Executing tests runner"
16 # shellcheck disable=SC2086
17diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
18index c41a2a2..13912db 100644
19--- a/snap/snapcraft.yaml
20+++ b/snap/snapcraft.yaml
21@@ -70,7 +70,7 @@ parts:
22 plugin: make
23 source: https://git.launchpad.net/ubuntu/+source/dnsmasq
24 source-type: git
25- source-branch: applied/2.79-1
26+ source-branch: applied/2.79-1ubuntu0.3
27 build-packages:
28 - build-essential
29 make-parameters:

Subscribers

People subscribed via source and target branches