From 8ea50693c3d6c7ccfa25736d0c215a07280f78e3 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Fri, 29 Apr 2016 14:24:51 +0300 Subject: [PATCH] Refactoring of identifiers saving --- hererocks.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/hererocks.py b/hererocks.py index 49cdde7..8150c98 100755 --- a/hererocks.py +++ b/hererocks.py @@ -1622,7 +1622,6 @@ def main(argv=None): opts.builds = os.path.abspath(opts.builds) identifiers = get_installed_identifiers() - identifiers_changed = False if not os.path.exists(opts.location): os.makedirs(opts.location) @@ -1631,29 +1630,26 @@ def main(argv=None): if "LuaJIT" in identifiers: del identifiers["LuaJIT"] - identifiers_changed = RioLua(opts.lua).update_identifiers(identifiers) + if RioLua(opts.lua).update_identifiers(identifiers): + save_installed_identifiers(identifiers) + os.chdir(start_dir) if opts.luajit: if "lua" in identifiers: del identifiers["lua"] - identifiers_changed = LuaJIT(opts.luajit).update_identifiers(identifiers) - os.chdir(start_dir) + if LuaJIT(opts.luajit).update_identifiers(identifiers): + save_installed_identifiers(identifiers) - if identifiers_changed: - save_installed_identifiers(identifiers) - identifiers_changed = False + os.chdir(start_dir) if opts.luarocks: if LuaRocks(opts.luarocks).update_identifiers(identifiers): - identifiers_changed = True + save_installed_identifiers(identifiers) os.chdir(start_dir) - if identifiers_changed: - save_installed_identifiers(identifiers) - shutil.rmtree(temp_dir) print("Done.") sys.exit(0)