dgit.raspbian.org Git - snapd.git/commit

[PATCH 03/18] Merge pull request from GHSA-p9v8-q5m4-pf46

* o/hookstate: recognize "--" in snapctl argument parser

When parsing snapctl argument vector recognize the "--" as an option
terminator, so that dash-options are not recognized afterwards.

Fixes: https://bugs.launchpad.net/snapd/+bug/2065077
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
* tests: add regression test for lp-2065077

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
---------

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Gbp-Pq: Name 0005-PATCH-03-18-Merge-pull-request-from-GHSA-p9v8-q5m4-p.patch

author	Zygmunt Bazyli Krynicki <zygmunt.krynicki@canonical.com>
	Fri, 24 May 2024 11:48:46 +0000 (13:48 +0200)
committer	Zygmunt Krynicki <me@zygoon.pl>
	Wed, 5 Jun 2024 08:16:06 +0000 (10:16 +0200)
commit	81b900b7fbbcbfd61918abf25c43ba7ac9bbbb65
tree	89b78ad9c318b2488828e39057a10de4e69e2358	tree \| snapshot
parent	d25f12f250a72ceeeae20ff5f4850b64e7343852	commit \| diff

overlord/hookstate/ctlcmd/ctlcmd.go		diff \| blob \| history
overlord/hookstate/ctlcmd/ctlcmd_test.go		diff \| blob \| history
tests/regression/lp-2065077/task.yaml	[new file with mode: 0644]	blob
tests/regression/lp-2065077/test-snapd-sh/bin/sh	[new file with mode: 0755]	blob
tests/regression/lp-2065077/test-snapd-sh/meta/snap.yaml	[new file with mode: 0644]	blob