mirror of https://gitlab.com/ita1024/waf.git
extras: rst: use to_list on rst options, use -o switch to make older rst2pdf happy
This commit is contained in:
parent
669094a51f
commit
2b309cfb79
|
@ -121,7 +121,7 @@ class rst2html(docutils):
|
|||
dst = self.outputs[0].bldpath()
|
||||
|
||||
cmd = [rst2x]
|
||||
cmd += getattr(self.generator, 'options', [])
|
||||
cmd += Utils.to_list(getattr(self.generator, 'options', []))
|
||||
stylesheet = getattr(self.generator, 'stylesheet', None)
|
||||
if stylesheet is not None:
|
||||
stylesheet = self.generator.to_nodes(stylesheet)[0]
|
||||
|
@ -137,8 +137,8 @@ class rst2pdf(docutils):
|
|||
src = self.inputs[0].bldpath()
|
||||
dst = self.outputs[0].bldpath()
|
||||
|
||||
cmd = [rst2x, src, dst]
|
||||
cmd += getattr(self.generator, 'options', [])
|
||||
cmd = [rst2x, src, '-o', dst]
|
||||
cmd += Utils.to_list(getattr(self.generator, 'options', []))
|
||||
|
||||
return self.exec_command(cmd)
|
||||
|
||||
|
|
Loading…
Reference in New Issue