From 4295b459d296168b7d49d64fccf6223d264d6df3 Mon Sep 17 00:00:00 2001
From: Jan Pokorný <jpokorny@redhat.com>
Date: Wed, 9 Dec 2015 17:44:40 +0100
Subject: filters/cmd_wrap: cmd_args_cutter: longest match first
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
---
 filters/cmd_wrap.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'filters')

diff --git a/filters/cmd_wrap.py b/filters/cmd_wrap.py
index 90caf8b..8098c97 100644
--- a/filters/cmd_wrap.py
+++ b/filters/cmd_wrap.py
@@ -28,11 +28,6 @@ def cmd_args_cutter(itemgroups):
                 end = len(i)
                 while pos + 1 < end:
                     pos += 1
-                    if pos <= end - 2:
-                        if i[pos] in ("op", "meta"):
-                            ret.append(tuple(acc))
-                            acc = [i[pos]]
-                            continue
                     if pos <= end - 4:
                         if i[pos:pos + 2] in (("resource", "create"),
                                               ("stonith", "create")):
@@ -42,6 +37,11 @@ def cmd_args_cutter(itemgroups):
                             acc = []
                             pos += 3
                             continue
+                    if pos <= end - 2:
+                        if i[pos] in ("op", "meta"):
+                            ret.append(tuple(acc))
+                            acc = [i[pos]]
+                            continue
                     # TBD
                     acc.append(i[pos])
                 ret.append(tuple(acc))
-- 
cgit