Merge pull request #28 from SUSE/master-bsc1129956

make 'smdba space-overview' postgresql version agnostic; fix version …
SUSE · Mar 26, 2019 · 36183b4 · 36183b4
2 parents 8f72423 + 8891c87
commit 36183b4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 setup (
   name = 'SUSE Manager Database Control',
-  version = '1.6.3',
+  version = '1.6.4',
   package_dir = {'': 'src'},
   package_data={'smdba': ['scenarios/*.scn']},
   packages = [

diff --git a/src/smdba/postgresqlgate.py b/src/smdba/postgresqlgate.py
@@ -488,7 +488,9 @@ class Info(object):
                                       None, "-u", "postgres", "/bin/bash")
         self.to_stderr(stderr)
         overview = [('Database', 'DB Size (Mb)', 'Avail (Mb)', 'Partition Disk Size (Mb)', 'Use %',)]
-        for line in stdout.split("\n")[2:]:
+        for line in stdout.split("\n"):
+            if "|" not in line or "pg_database_size" in line:  # Different versions of postgresql
+                continue
             line = filter(None, line.strip().replace('|', '').split(" "))
             if len(line) != 2:
                 continue

diff --git a/src/smdba/smdba b/src/smdba/smdba
@@ -39,7 +39,7 @@ class Console:
     """
 
     # General
-    VERSION = "1.6.2"
+    VERSION = "1.6.4"
     DEFAULT_CONFIG = "/etc/rhn/rhn.conf"
 
     # Config