git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Keep xml files valid :-/
[sfa.git]
/
sfatables
/
commands
/
Add.py
diff --git
a/sfatables/commands/Add.py
b/sfatables/commands/Add.py
index
f5193eb
..
c6f89a8
100644
(file)
--- a/
sfatables/commands/Add.py
+++ b/
sfatables/commands/Add.py
@@
-4,12
+4,11
@@
from sfatables.command import Command
from sfatables.globals import *
class Add(Command):
from sfatables.globals import *
class Add(Command):
- options = [('-A','--add')]
- help = 'Add a rule to a chain'
- matches = True
- targets = True
-
def __init__(self):
def __init__(self):
+ self.options = [('-A','--add')]
+ self.help = 'Add a rule to a chain'
+ self.matches = True
+ self.targets = True
return
def getnextfilename(self,type,chain):
return
def getnextfilename(self,type,chain):
@@
-27,7
+26,7
@@
class Add(Command):
return "sfatables-%d-%s"%(last_rule_number+1,type)
def call_gen(self, chain, type, dir, options):
return "sfatables-%d-%s"%(last_rule_number+1,type)
def call_gen(self, chain, type, dir, options):
- filename =
dir + "/"+options.name+".xml"
+ filename =
os.path.join(dir, options.name+".xml")
xmldoc = libxml2.parseFile(filename)
p = xmldoc.xpathNewContext()
xmldoc = libxml2.parseFile(filename)
p = xmldoc.xpathNewContext()
@@
-53,7
+52,9
@@
class Add(Command):
context[0].addChild(valueNode)
filename = self.getnextfilename(type,chain)
context[0].addChild(valueNode)
filename = self.getnextfilename(type,chain)
- file_path = sfatables_config + '/' + chain + '/' + filename
+ file_path = os.path.join(sfatables_config, chain, filename)
+ if not os.path.isdir(os.path.dirname(file_path)):
+ os.makedirs(os.path.dirname(file_path))
xmldoc.saveFile(file_path)
p.xpathFreeContext()
xmldoc.freeDoc()
xmldoc.saveFile(file_path)
p.xpathFreeContext()
xmldoc.freeDoc()