[alias] Fix argument consumption, allow multiple usage of same var

modules/alias.py

@@ -114,7 +114,7 @@ def set_variable(name, value, creator):
     context.save()
 
 
-def replace_variables(cnt, msg=None):
+def replace_variables(cnts, msg=None):
     """Replace variables contained in the content
 
     Arguments:
@@ -122,10 +122,12 @@ def replace_variables(cnt, msg=None):
     msg -- optional message where pick some variables
     """
 
-    if isinstance(cnt, list):
-        return [replace_variables(c, msg) for c in cnt]
-
     unsetCnt = list()
+    if not isinstance(cnts, list):
+        cnts = list(cnts)
+    resultCnt = list()
+
+    for cnt in cnts:
         for res in re.findall("\\$\{(?P<name>[a-zA-Z0-9:]+)\}", cnt):
             rv = re.match("([0-9]+)(:([0-9]*))?", res)
             if rv is not None:
@@ -147,9 +149,12 @@ def replace_variables(cnt, msg=None):
                     unsetCnt.append(varI)
             else:
                 cnt = cnt.replace("${%s}" % res, get_variable(res), 1)
-    for u in sorted(unsetCnt, reverse=True):
-        msg.args.pop(u)
-    return cnt
+        resultCnt.append(cnt)
+
+    for u in sorted(set(unsetCnt), reverse=True):
+        k = msg.args.pop(u)
+
+    return resultCnt
 
 
 # MODULE INTERFACE ####################################################