Merge pull request #34557 from jacobweinstock/jboss7_cli-handle-expre…

…ssion-type handle jboss cli expression type in the parsing of output
saltstack · Jul 14, 2016 · b3dc603 · b3dc603
2 parents a7868c2 + 1945153
commit b3dc603
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/salt/modules/jboss7_cli.py b/salt/modules/jboss7_cli.py
@@ -298,6 +298,9 @@ def __process_tokens_internal(tokens, start_at=0):
         elif __is_assignment(token):
             log.debug("    TYPE: ASSIGNMENT")
             is_assignment = True
+        elif __is_expression(token):
+            log.debug("    TYPE: EXPRESSION")
+            is_expression = True
         else:
             raise CommandExecutionError('Unknown token! Token: {0}'.format(token))
 
@@ -372,3 +375,7 @@ def __get_quoted_string(token):
 
 def __is_assignment(token):
     return token == '=>'
+
+
+def __is_expression(token):
+    return token == 'expression'