From 0980de3da64e273a363dace79e56345bc4ed2dbc Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fl.fischer@fau.de>
Date: Fri, 13 Dec 2019 16:14:37 +0100
Subject: move allocbench_version to facter and make the facts a global
 variable of facter.py

---
 merge.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'merge.py')

diff --git a/merge.py b/merge.py
index 4812c37..77fe73c 100755
--- a/merge.py
+++ b/merge.py
@@ -25,7 +25,8 @@ import os
 import pickle
 import sys
 
-from src.util import print_license_and_exit, print_version_and_exit
+import src.facter
+from src.util import print_license_and_exit
 
 def load_file(filename):
     if filename.endswith("json"):
@@ -41,7 +42,8 @@ def main():
         print_license_and_exit()
 
     if "--version" in sys.argv:
-        print_version_and_exit()
+        print(src.facter.allocbench_version())
+        exit(0)
 
     parser = argparse.ArgumentParser(description="Merge to allocbench results")
     parser.add_argument("src", help="results which should be merged into dest", type=str)
-- 
cgit v1.2.3