git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
properties and emailTxt
[monitor.git]
/
nodesets.py
diff --git
a/nodesets.py
b/nodesets.py
index
63b049c
..
6461dfb
100755
(executable)
--- a/
nodesets.py
+++ b/
nodesets.py
@@
-3,7
+3,8
@@
import sys
import os
from sets import Set
import sys
import os
from sets import Set
-import parser as parsermodule
+from monitor import parser as parsermodule
+from monitor.util import file
def main():
parser = parsermodule.getParser()
def main():
parser = parsermodule.getParser()
@@
-16,8
+17,8
@@
def main():
f1 = config.args[0]
f2 = config.args[1]
f1 = config.args[0]
f2 = config.args[1]
- s1 =
config
.getListFromFile(f1)
- s2 =
config
.getListFromFile(f2)
+ s1 =
file
.getListFromFile(f1)
+ s2 =
file
.getListFromFile(f2)
s = nodesets(config.operation, s1, s2)
s = nodesets(config.operation, s1, s2)
@@
-44,3
+45,6
@@
def nodesets(operation, s1, s2):
print "Unknown operation: %s " % operation
return []
print "Unknown operation: %s " % operation
return []
+
+if __name__ == "__main__":
+ main()