diff options
| author | Florian Fischer <florian.fl.fischer@fau.de> | 2019-12-13 16:14:37 +0100 |
|---|---|---|
| committer | Florian Fischer <florian.fl.fischer@fau.de> | 2019-12-14 01:06:24 +0100 |
| commit | 0980de3da64e273a363dace79e56345bc4ed2dbc (patch) | |
| tree | 731e4790728176038c70cd6a409540182969f5b1 /merge.py | |
| parent | abc685736453ae866a7dd450a4ef4f30528f845f (diff) | |
| download | allocbench-0980de3da64e273a363dace79e56345bc4ed2dbc.tar.gz allocbench-0980de3da64e273a363dace79e56345bc4ed2dbc.zip | |
move allocbench_version to facter and make the facts a global variable of facter.py
Diffstat (limited to 'merge.py')
| -rwxr-xr-x | merge.py | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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) |
