diff --git a/ChangeLog b/ChangeLog index b2ca76fb..c9a89b09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -65,10 +65,11 @@ Closes: SF bug #1062034 Changed: linkchecker, linkchecker.1 - * ANSI color support for the colored text logger is now detected - on Windows systems. - Type: feature - Changed: linkcheck/ansicolor.py + * Make --quiet an alias for -o none. + Type: bugfix + Closes: SF bug #1063144 + Changed: linkchecker, linkcheck/configuration.py, + linkcheck/checker/consumer.py 1.13.5 "Die Musterknaben" (released 22.9.2004) * Use xgettext with Python support for .pot file creation, adjusted diff --git a/linkcheck/checker/consumer.py b/linkcheck/checker/consumer.py index 92c1fce7..5cd47abb 100644 --- a/linkcheck/checker/consumer.py +++ b/linkcheck/checker/consumer.py @@ -140,8 +140,7 @@ class Consumer (object): """start output of all configured loggers""" self.lock.acquire() try: - if not self.config['quiet']: - self.logger.start_output() + self.logger.start_output() for logger in self.fileoutput: logger.start_output() finally: @@ -157,9 +156,8 @@ class Consumer (object): self.errors = True if url_data.warning and self.config["warnings"]: self.warnings = True - if not self.config['quiet'] and \ - (self.config["verbose"] or not url_data.valid or - (url_data.warning and self.config["warnings"])): + if (self.config["verbose"] or not url_data.valid or + (url_data.warning and self.config["warnings"])): self.logger.new_url(url_data) for log in self.fileoutput: log.new_url(url_data) @@ -173,8 +171,7 @@ class Consumer (object): """end output of all configured loggers""" self.lock.acquire() try: - if not self.config['quiet']: - self.logger.end_output(linknumber=self.linknumber) + self.logger.end_output(linknumber=self.linknumber) for logger in self.fileoutput: logger.end_output(linknumber=self.linknumber) finally: diff --git a/linkcheck/configuration.py b/linkcheck/configuration.py index b340fe28..799557b7 100644 --- a/linkcheck/configuration.py +++ b/linkcheck/configuration.py @@ -124,7 +124,6 @@ class Configuration (dict): } self['none'] = {} self['logger'] = self.logger_new('text') - self["quiet"] = False self["warningregex"] = None self["warnsizebytes"] = None self["nntpserver"] = os.environ.get("NNTP_SERVER", None) @@ -229,7 +228,8 @@ class Configuration (dict): except ConfigParser.Error, msg: linkcheck.log.debug(linkcheck.LOG_CHECK, msg) try: - self["quiet"] = cfgparser.getboolean(section, "quiet") + if cfgparser.getboolean(section, "quiet"): + self['logger'] = self.logger_new('none') except ConfigParser.Error, msg: linkcheck.log.debug(linkcheck.LOG_CHECK, msg) try: diff --git a/linkchecker b/linkchecker index d7952b11..28195ef1 100755 --- a/linkchecker +++ b/linkchecker @@ -482,7 +482,7 @@ if options.pause is not None: if options.profile is not None: do_profile = options.profile if options.quiet is not None: - config["quiet"] = options.quiet + config['logger'] = config.logger_new('none') if options.recursionlevel is not None: config["recursionlevel"] = options.recursionlevel if options.externstrictall is not None: