From c9e333b5f01f4932f2fc7da48b300dab27aae0cb Mon Sep 17 00:00:00 2001
From: Bruno Goncalves <bgoncalv@redhat.com>
Date: Mar 20 2018 09:00:37 +0000
Subject: fixed merge-standard-inventory script code using inspekt


---

diff --git a/scripts/merge-standard-inventory b/scripts/merge-standard-inventory
index b5a288f..6e3d5be 100755
--- a/scripts/merge-standard-inventory
+++ b/scripts/merge-standard-inventory
@@ -92,7 +92,7 @@ def merge_standard_inventories(args):
 
         try:
             inv_out = subprocess.check_output(cmd, stdin=None, close_fds=True)
-        except subprocess.CalledProcessError as ex:
+        except subprocess.CalledProcessError:
             raise RuntimeError("Could not run: {0}".format(str(cmd)))
 
         merged.merge(inv_out.decode('utf-8'))
@@ -203,5 +203,6 @@ class Inventory:
             "hosts": self.hosts, "vars": {}}, "_meta": {"hostvars": self.variables}}
         return json.dumps(data, indent=4, separators=(',', ': '))
 
+
 if __name__ == '__main__':
     sys.exit(main(sys.argv))