From 237342254f7efeacbccf497450ad55a639a42097 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Wed, 31 Oct 2018 09:40:53 +0100
Subject: [PATCH] Partially revert unpacking stage in AppMgr

---
 basic/srv/vm/mgr/appmgr.py  | 6 ++----
 basic/srv/vm/mgr/wsgiapp.py | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/basic/srv/vm/mgr/appmgr.py b/basic/srv/vm/mgr/appmgr.py
index b7b7ea7..01f442e 100644
--- a/basic/srv/vm/mgr/appmgr.py
+++ b/basic/srv/vm/mgr/appmgr.py
@@ -32,7 +32,7 @@ class ActionItem:
 
 class InstallItem:
     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.total = total
         self.downloaded = 0
@@ -110,12 +110,10 @@ class AppMgr:
         for dep in deps:
             self.download_package(dep, item.data)
         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
             self.purge_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
             self.run_uninstall_script(dep)
             self.register_package(dep)
diff --git a/basic/srv/vm/mgr/wsgiapp.py b/basic/srv/vm/mgr/wsgiapp.py
index faee738..97f706e 100644
--- a/basic/srv/vm/mgr/wsgiapp.py
+++ b/basic/srv/vm/mgr/wsgiapp.py
@@ -184,8 +184,6 @@ class WSGIApp(object):
                 if item.data.stage == 0:
                     status = 'Stahuje se ({} %)'.format(item.data)
                 elif item.data.stage == 1:
-                    status = 'Rozbaluje se'
-                elif item.data.stage == 2:
                     status = 'Instalují se závislosti'
                 else:
                     status = 'Instaluje se'