diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | sos/plugins/openstack.py | 1 | ||||
| -rw-r--r-- | sos/policies/__init__.py | 2 | ||||
| -rw-r--r-- | sos/utilities.py | 4 |
4 files changed, 4 insertions, 4 deletions
@@ -1,6 +1,7 @@ Adam Stokes <astokes@redhat.com> Ben Turner <bturner@redhat.com> Eugene Teo <eteo@redhat.com> +Gary Kotton <gkotton@redhat.com> Jesse Jaggars <jjaggars@redhat.com> Joey Boggs <jboggs@redhat.com> John Berninger <jwb@redhat.com> diff --git a/sos/plugins/openstack.py b/sos/plugins/openstack.py index c15b2b70..20e6a270 100644 --- a/sos/plugins/openstack.py +++ b/sos/plugins/openstack.py @@ -140,7 +140,6 @@ class RedHatOpenStack(openstack, RedHatPlugin): if (os.path.isfile('/etc/redhat-release') or os.path.isfile('/etc/fedora-release')): self.collectExtOutput("/usr/bin/openstack-status") - self.collectExtOutput("/usr/bin/nova-manage service list") # Nova self.addCopySpecs(["/etc/nova/", diff --git a/sos/policies/__init__.py b/sos/policies/__init__.py index 32ecb0a0..57803264 100644 --- a/sos/policies/__init__.py +++ b/sos/policies/__init__.py @@ -217,7 +217,7 @@ No changes will be made to your system. if not final_filename: return False - archive_fp = open(final_filename, 'r') + archive_fp = open(final_filename, 'rb') digest = hashlib.new(get_hash_name()) digest.update(archive_fp.read()) archive_fp.close() diff --git a/sos/utilities.py b/sos/utilities.py index ee241589..9b062bb1 100644 --- a/sos/utilities.py +++ b/sos/utilities.py @@ -381,14 +381,14 @@ class DirTree(object): try: import pwd return pwd.getpwuid(stats.st_uid)[0] - except ImportError: + except: return str(stats.st_uid) def _get_group(self, stats): try: import grp return grp.getgrgid(stats.st_gid)[0] - except ImportError: + except: return str(stats.st_uid) def _format(self, path): |