Refactoring of identifiers saving
This commit is contained in:
parent
835d70d3b7
commit
8ea50693c3
18
hererocks.py
18
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 identifiers_changed:
|
||||
if LuaJIT(opts.luajit).update_identifiers(identifiers):
|
||||
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)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user