]>
Commit | Line | Data |
---|---|---|
337caaa3 JB |
1 | --- fence-agents-4.0.24/fence/agents/lib/check_used_options.py.orig 2016-08-22 14:33:34.000000000 +0200 |
2 | +++ fence-agents-4.0.24/fence/agents/lib/check_used_options.py 2016-10-16 16:32:47.907160497 +0200 | |
106ac479 | 3 | @@ -22,6 +22,12 @@ |
efe332c8 JB |
4 | |
5 | ## add UUID which is derived automatically from --plug if possible | |
6 | available["--uuid"] = True | |
7 | + # --plugs is constructed from --plug | |
8 | + available["--plugs"] = True | |
9 | + # probably should be defined | |
10 | + available["--managed"] = True | |
106ac479 JB |
11 | + # used temporarily in lib/fencing.py |
12 | + available["--original-action"] = True | |
efe332c8 JB |
13 | |
14 | ## all_opt defined in fence agent are found | |
15 | agent_file = open(agent) | |
106ac479 | 16 | @@ -48,12 +54,12 @@ |
efe332c8 | 17 | |
45cde7bb | 18 | for option in option_use_re.findall(line): |
337caaa3 JB |
19 | if option not in available: |
20 | - print("ERROR on line %d in %s: option %s is not defined" % (counter, agent, option_use_re.search(line).group(1))) | |
21 | + print("ERROR on line %d in %s: option %s is not defined" % (counter, agent, option)) | |
efe332c8 JB |
22 | without_errors = False |
23 | ||
45cde7bb | 24 | for option in option_has_re.findall(line): |
337caaa3 JB |
25 | if option not in available: |
26 | - print("ERROR on line %d in %s: option %s is not defined" % (counter, agent, option_has_re.search(line).group(1))) | |
27 | + print("ERROR on line %d in %s: option %s is not defined" % (counter, agent, option)) | |
efe332c8 JB |
28 | without_errors = False |
29 | ||
30 | if without_errors: |