diff options
| author | Jesse Jaggars <jjaggars@redhat.com> | 2012-02-22 10:23:31 -0600 |
|---|---|---|
| committer | Jesse Jaggars <jjaggars@redhat.com> | 2012-02-22 10:23:31 -0600 |
| commit | 094621dbb01931abc9b7999af49c8dfad6cda3d3 (patch) | |
| tree | db396ea77ba0b7f31f2ac848acda4fbbc999ff17 | |
| parent | b9e3af0fcb073bac996dbf048f8d73b8b14008f0 (diff) | |
| parent | d6efece391caa53087b9c1bb00182ce0565cef23 (diff) | |
| download | sos-094621dbb01931abc9b7999af49c8dfad6cda3d3.tar.gz | |
Merge branch 'master' of https://github.com/battlemidget/sosreport
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | sos/policies/ubuntu.py | 2 | ||||
| -rw-r--r-- | sos/sosreport.py | 3 |
3 files changed, 4 insertions, 3 deletions
@@ -50,7 +50,7 @@ install: updateversion for d in $(SUBDIRS); do make DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done updateversion: - sed 's/@SOSVERSION@/$(VERSION)/g' sos/__init__.py.in > sos/__init__.py + sed 's/@SOSVERSION@/$(VERSION)/g' sos/__init__.py.in > sos/__init__.py $(NAME)-$(VERSION).tar.gz: clean gpgkey @mkdir -p $(ARCHIVE_DIR) diff --git a/sos/policies/ubuntu.py b/sos/policies/ubuntu.py index d0ecae0f..7d61d054 100644 --- a/sos/policies/ubuntu.py +++ b/sos/policies/ubuntu.py @@ -1,8 +1,8 @@ +from __future__ import with_statement from sos import _sos as _ from sos.plugins import UbuntuPlugin, IndependentPlugin from sos.policies.debian import DebianPolicy, DebianPackageManager from sos.utilities import shell_out -from __future__ import with_statement import os diff --git a/sos/sosreport.py b/sos/sosreport.py index 08f11fd6..fb2622ab 100644 --- a/sos/sosreport.py +++ b/sos/sosreport.py @@ -429,7 +429,8 @@ class SoSReport(object): for plugin_class in plugin_classes: if not self.policy.validatePlugin(plugin_class): self.soslog.debug(_("plugin %s does not validate, skipping") % plug) - self._skip(plugin_class, _("does not validate")) + if self.opts.verbosity > 0: + self._skip(plugin_class, _("does not validate")) continue if plugin_class.requires_root and not self._is_root: |