From d59850d433ec5497e9b34d5eccb38117d8d2fa75 Mon Sep 17 00:00:00 2001 From: "Martin A. Brown" Date: Thu, 10 Mar 2016 11:42:59 -0800 Subject: [PATCH] skip adding to removals if in --script mode --- tldp/doctypes/docbook4xml.py | 3 ++- tldp/doctypes/docbook5xml.py | 3 ++- tldp/doctypes/docbooksgml.py | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tldp/doctypes/docbook4xml.py b/tldp/doctypes/docbook4xml.py index 6435435..7ab4a30 100644 --- a/tldp/doctypes/docbook4xml.py +++ b/tldp/doctypes/docbook4xml.py @@ -85,7 +85,8 @@ class Docbook4XML(BaseDoctype, SignatureChecker): s = '''"{config.docbook4xml_xsltproc}" > "{output.name_fo}" \\ "{config.docbook4xml_xslprint}" \\ "{output.validsource}"''' - self.removals.add(self.output.name_fo) + if not self.config.script: + self.removals.add(self.output.name_fo) return self.shellscript(s, **kwargs) # -- this is conditionally built--see logic in make_name_pdf() below diff --git a/tldp/doctypes/docbook5xml.py b/tldp/doctypes/docbook5xml.py index dce6087..f0068f4 100644 --- a/tldp/doctypes/docbook5xml.py +++ b/tldp/doctypes/docbook5xml.py @@ -104,7 +104,8 @@ class Docbook5XML(BaseDoctype, SignatureChecker): s = '''"{config.docbook5xml_xsltproc}" > "{output.name_fo}" \\ "{config.docbook5xml_xslprint}" \\ "{output.validsource}"''' - self.removals.add(self.output.name_fo) + if not self.config.script: + self.removals.add(self.output.name_fo) return self.shellscript(s, **kwargs) # -- this is conditionally built--see logic in make_name_pdf() below diff --git a/tldp/doctypes/docbooksgml.py b/tldp/doctypes/docbooksgml.py index 9537498..d53f0c7 100644 --- a/tldp/doctypes/docbooksgml.py +++ b/tldp/doctypes/docbooksgml.py @@ -69,7 +69,8 @@ class DocbookSGML(BaseDoctype, SignatureChecker): --verbose \\ -- "index.sgml" "{source.dirname}/index.sgml"''' indexsgml = os.path.join(self.source.dirname, 'index.sgml') - self.removals.add(indexsgml) + if not self.config.script: + self.removals.add(indexsgml) return self.shellscript(s, **kwargs) @depends(move_blank_indexsgml_into_source) @@ -109,7 +110,8 @@ class DocbookSGML(BaseDoctype, SignatureChecker): --force \\ -- "index.sgml" "{source.dirname}/index.sgml"''' logger.debug("%s creating %s", self.source.stem, indexsgml) - self.removals.add(indexsgml) + if not self.config.script: + self.removals.add(indexsgml) return self.shellscript(s, **kwargs) @depends(move_indexsgml_into_source)