mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-07 01:06:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

python-smartpm: Fix channel command --remove-all option (again)

Browse Source 
SmartPM's --remove-all option was unusable, because the fix from
commit 03266e89a6 was lost in commit 5fc580fc44. Thus, add a new
patch to fix --remove-all.

It seems like the previous fix was lost by mistake:
Upstream merged the *old* version of the patch (smartpm 406541f569),
and when SmartPM in oe-core was upgraded to the new upstream release,
the --remove-all fix from the *new* patch was not carried over.

(From OE-Core rev: ba2adda60dd34b6a8feba413e3207dd8e4580294)

(From OE-Core rev: df76bd9ff6289d2b561d8f79a39bc90ba3c6a488)

Signed-off-by: Daniel Klauer <daniel.klauer@gin.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Klauer, Daniel
2016-05-17 12:55:39 +00:00
committed by Richard Purdie
parent e506807f54
commit 4007b48cf0
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
meta/recipes-devtools/python/python-smartpm/smart-channel-remove-all.patch Normal file
View File

@@ -0,0 +1,33 @@
From 6d2363a705697f615d9e5af5d6703b291e618b46 Mon Sep 17 00:00:00 2001
From: Daniel Klauer <daniel.klauer@gin.de>
Date: Thu, 12 May 2016 17:55:01 +0200
Subject: [PATCH] Fix channel command --remove-all option parsing
Option.take_action() stores a list of options given for validation later.
It strips leading dashes and turns remaining dashes into underscores.
This list is what ensure_action() will compare its arguments against,
thus we must use underscores here.
Upstream-Status: Pending
Signed-off-by: Daniel Klauer <daniel.klauer@gin.de>
---
smart/commands/channel.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/smart/commands/channel.py b/smart/commands/channel.py
index 108f3f1..6234f69 100644
--- a/smart/commands/channel.py
+++ b/smart/commands/channel.py
@@ -164,7 +164,7 @@ def main(ctrl, opts):
opts.check_args_of_option("edit", 0)
opts.check_args_of_option("enable", -1)
opts.check_args_of_option("disable", -1)
- opts.ensure_action("channel", ["add", "set", "remove", "remove-all",
+ opts.ensure_action("channel", ["add", "set", "remove", "remove_all",
"list", "show", "yaml", "enable", "disable"])
opts.check_remaining_args()
--
1.9.1