diff --git a/tldp/config.py b/tldp/config.py index 0ab6cbb..6bd0459 100644 --- a/tldp/config.py +++ b/tldp/config.py @@ -14,6 +14,7 @@ logger = logging.getLogger(__name__) DEFAULT_CONFIGFILE = '/etc/ldptool/ldptool.ini' + def collectconfiguration(tag, argv): ap = DefaultFreeArgumentParser() diff --git a/tldp/doctypes/asciidoc.py b/tldp/doctypes/asciidoc.py index 2104cc6..706d7d5 100644 --- a/tldp/doctypes/asciidoc.py +++ b/tldp/doctypes/asciidoc.py @@ -7,7 +7,7 @@ import logging from tldp.utils import which from tldp.utils import arg_isexecutable, isexecutable -from tldp.doctypes.common import BaseDoctype, depends +from tldp.doctypes.common import depends from tldp.doctypes.docbook4xml import Docbook4XML logger = logging.getLogger(__name__) diff --git a/tldp/doctypes/common.py b/tldp/doctypes/common.py index e58e515..c2d926d 100644 --- a/tldp/doctypes/common.py +++ b/tldp/doctypes/common.py @@ -181,7 +181,7 @@ class BaseDoctype(object): raise Exception(etext % (self.source.stem,)) @logtimings(logger.debug) - def dump_shellscript(self, script, preamble=preamble, + def dump_shellscript(self, script, preamble=preamble, postamble=postamble, **kwargs): source = self.source output = self.output @@ -193,7 +193,7 @@ class BaseDoctype(object): return True @logtimings(logger.debug) - def execute_shellscript(self, script, preamble=preamble, + def execute_shellscript(self, script, preamble=preamble, postamble=postamble, **kwargs): source = self.source output = self.output diff --git a/tldp/doctypes/docbooksgml.py b/tldp/doctypes/docbooksgml.py index 37aa543..9537498 100644 --- a/tldp/doctypes/docbooksgml.py +++ b/tldp/doctypes/docbooksgml.py @@ -119,9 +119,9 @@ class DocbookSGML(BaseDoctype, SignatureChecker): if not self.config.script: cwd = os.getcwd() if not os.path.samefile(cwd, self.output.dirname): - logger.error("%s (cowardly) refusing to clean directory %s", + logger.error("%s (cowardly) refusing to clean directory %s", self.source.stem, cwd) - logger.error("%s expected to find %s", + logger.error("%s expected to find %s", self.source.stem, self.output.dirname) return False s = '''find . -mindepth 1 -maxdepth 1 -not -type d -delete -print''' diff --git a/tldp/driver.py b/tldp/driver.py index e7ef2f2..2f10e24 100644 --- a/tldp/driver.py +++ b/tldp/driver.py @@ -319,7 +319,7 @@ def publish(config, docs, **kwargs): # swapdirs(source.working.dirname, source.output.dirname) if os.path.isdir(source.working.dirname): - logger.debug("%s removing old directory %s", + logger.debug("%s removing old directory %s", source.stem, source.working.dirname) shutil.rmtree(source.working.dirname) post_publish_cleanup(docs) @@ -528,6 +528,7 @@ def handleArgs(config, args): return "Fell through handleArgs(); programming error." + def run(argv): # -- may want to see option parsing, so set --loglevel as # soon as possible diff --git a/tldp/sources.py b/tldp/sources.py index 18a7b8a..47e1e8f 100644 --- a/tldp/sources.py +++ b/tldp/sources.py @@ -198,8 +198,8 @@ class SourceDocument(object): def detail(self, widths, verbose, file=sys.stdout): '''produce a small tabular output about the document''' template = ' '.join(('{s.status:{w.status}}', - '{s.doctype.formatname:{w.doctype}}', - '{s.stem:{w.stem}}')) + '{s.doctype.formatname:{w.doctype}}', + '{s.stem:{w.stem}}')) outstr = template.format(s=self, w=widths) print(outstr, file=file) if verbose: