epicknex/hererocks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring of identifiers saving

Browse Source
This commit is contained in:
Peter Melnichenko 2016-04-29 14:24:51 +03:00
parent 835d70d3b7
commit 8ea50693c3
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hererocks.py
View File

@ -1622,7 +1622,6 @@ def main(argv=None):
opts.builds = os.path.abspath(opts.builds) opts.builds = os.path.abspath(opts.builds)
identifiers = get_installed_identifiers() identifiers = get_installed_identifiers()
identifiers_changed = False
if not os.path.exists(opts.location): if not os.path.exists(opts.location):
os.makedirs(opts.location) os.makedirs(opts.location)
@ -1631,29 +1630,26 @@ def main(argv=None):
if "LuaJIT" in identifiers: if "LuaJIT" in identifiers:
del identifiers["LuaJIT"] 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) os.chdir(start_dir)
if opts.luajit: if opts.luajit:
if "lua" in identifiers: if "lua" in identifiers:
del identifiers["lua"] del identifiers["lua"]
identifiers_changed = LuaJIT(opts.luajit).update_identifiers(identifiers) if LuaJIT(opts.luajit).update_identifiers(identifiers):
os.chdir(start_dir) save_installed_identifiers(identifiers)
if identifiers_changed: os.chdir(start_dir)
save_installed_identifiers(identifiers)
identifiers_changed = False
if opts.luarocks: if opts.luarocks:
if LuaRocks(opts.luarocks).update_identifiers(identifiers): if LuaRocks(opts.luarocks).update_identifiers(identifiers):
identifiers_changed = True save_installed_identifiers(identifiers)
os.chdir(start_dir) os.chdir(start_dir)
if identifiers_changed:
save_installed_identifiers(identifiers)
shutil.rmtree(temp_dir) shutil.rmtree(temp_dir)
print("Done.") print("Done.")
sys.exit(0) sys.exit(0)