diff --git a/usr/lib/python3.8/vmmgr/appmgr.py b/usr/lib/python3.8/vmmgr/appmgr.py index 5b73005..f23f11f 100644 --- a/usr/lib/python3.8/vmmgr/appmgr.py +++ b/usr/lib/python3.8/vmmgr/appmgr.py @@ -3,12 +3,12 @@ import os import subprocess -from .pkgmgr import Pkg, PkgMgr +#from .pkgmgr import Pkg, PkgMgr class AppMgr: def __init__(self, conf): self.conf = conf - self.pkgmgr = PkgMgr(conf) + self.pkgmgr = None #PkgMgr(conf) def start_app(self, item): # Start the actual app service @@ -54,7 +54,7 @@ class AppMgr: def install_app(self, item): # Main installation function. Wrapper for download, registration and install script - item.data = Pkg() + item.data = None #Pkg() self.pkgmgr.install_app(item.key, item.data) def uninstall_app(self, item): @@ -68,7 +68,7 @@ class AppMgr: def update_app(self, item): # Main update function. Wrapper for download and update script self.stop_app(item) - item.data = Pkg() + item.data = None #Pkg() self.pkgmgr.update_app(item.key, item.data) def get_services_deps(self): diff --git a/usr/lib/python3.8/vmmgr/wsgiapp.py b/usr/lib/python3.8/vmmgr/wsgiapp.py index cae2ea3..4cef0b8 100644 --- a/usr/lib/python3.8/vmmgr/wsgiapp.py +++ b/usr/lib/python3.8/vmmgr/wsgiapp.py @@ -18,7 +18,7 @@ from . import validator from .actionqueue import ActionQueue from .appmgr import AppMgr from .config import Config -from .pkgmgr import Stage +#from .pkgmgr import Stage from .vmmgr import VMMgr from .wsgilang import WSGILang from .wsgisession import WSGISession @@ -228,11 +228,11 @@ class WSGIApp: status = '{} OK'.format(lang.package_manager_error()) actions = None else: - if item.data.stage == Stage.DOWNLOAD: + if item.data.stage == 0: #Stage.DOWNLOAD: status = '{} ({} %)'.format(lang.status_downloading(), item.data.percent_processed) - elif item.data.stage == Stage.UNPACK: + elif item.data.stage == 1: #Stage.UNPACK: status = lang.status_unpacking() - elif item.data.stage == Stage.INSTALL_DEPS: + elif item.data.stage == 2: #Stage.INSTALL_DEPS: status = lang.status_installing_deps() else: status = lang.status_installing()