Disassembler/Spotter-VM
1
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

Partially revert unpacking stage in AppMgr

Browse Source
This commit is contained in:
Disassembler 2018-10-31 09:40:53 +01:00
parent a339c8e8ff
commit 237342254f
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
basic/srv/vm/mgr/appmgr.py
View File

@ -32,7 +32,7 @@ class ActionItem:
class InstallItem: class InstallItem:
def __init__(self, total): def __init__(self, total):
# Stage 0 = download, 1 = unpack, 2 = deps install, 3 = app install # Stage 0 = download, 1 = deps install, 2 = app install
self.stage = 0 self.stage = 0
self.total = total self.total = total
self.downloaded = 0 self.downloaded = 0
@ -110,12 +110,10 @@ class AppMgr:
for dep in deps: for dep in deps:
self.download_package(dep, item.data) self.download_package(dep, item.data)
for dep in deps: for dep in deps:
item.data.stage = 1 item.data.stage = 2 if dep == deps[-1] else 1
# Purge old data before unpacking to clean previous failed installation # Purge old data before unpacking to clean previous failed installation
self.purge_package(dep) self.purge_package(dep)
self.unpack_package(dep) self.unpack_package(dep)
for deps in deps:
item.data.stage = 3 if dep == deps[-1] else 2
# Run uninstall script before installation to clean previous failed installation # Run uninstall script before installation to clean previous failed installation
self.run_uninstall_script(dep) self.run_uninstall_script(dep)
self.register_package(dep) self.register_package(dep)

2
basic/srv/vm/mgr/wsgiapp.py
View File

@ -184,8 +184,6 @@ class WSGIApp(object):
if item.data.stage == 0: if item.data.stage == 0:
status = 'Stahuje se ({} %)'.format(item.data) status = 'Stahuje se ({} %)'.format(item.data)
elif item.data.stage == 1: elif item.data.stage == 1:
status = 'Rozbaluje se'
elif item.data.stage == 2:
status = 'Instalují se závislosti' status = 'Instalují se závislosti'
else: else:
status = 'Instaluje se' status = 'Instaluje se'