Merge branch 'develop' into 'master'

Develop

See merge request sulinos/devel/inary!17
......@@ -180,6 +180,7 @@ class Install(AtomicOperation):
self.extract_install()
ctx.ui.status(_("Updating database"), push_screen=False)
self.store_inary_files()
self.update_databases()
ctx.enable_keyboard_interrupts()
......@@ -313,7 +314,6 @@ class Install(AtomicOperation):
if not self.trigger.preinstall(ctx.config.tmp_dir()):
util.clean_dir(self.package.pkg_dir())
ctx.ui.error(_('Pre-install configuration of \"{}\" package failed.').format(self.pkginfo.name))
raise SystemExit
def postinstall(self):
......@@ -333,7 +333,8 @@ class Install(AtomicOperation):
ctx.ui.info(_('Configuring post-install \"{}\"'.format(self.pkginfo.name)),color='brightyellow')
if not self.trigger.postinstall(self.package.pkg_dir()):
ctx.ui.error(_('Post-install configuration of \"{}\" package failed.').format(self.pkginfo.name))
raise SystemExit
self.installdb.mark_pending(self.pkginfo.name)
return 0
def extract_install(self):
......@@ -549,7 +550,6 @@ def __install(install, upgrade=False):
install.store_postops()
install.preinstall()
install.install(not upgrade)
install.store_inary_files()
install.postinstall()
class Remove(AtomicOperation):
......
......@@ -39,7 +39,6 @@ def reconfigure(packages=None):
pkginfo = installdb.get_package(x)
ops_Dir=installdb.package_path(x)
ctx.ui.notify(inary.ui.configuring, package=pkginfo, files=None)
print(ops_Dir)
inary.trigger.Trigger().postinstall(ops_Dir)
ctx.ui.notify(inary.ui.configured, package=pkginfo, files=None)
installdb.clear_pending(x)
......
......@@ -99,7 +99,6 @@ def install_pkg_names(A, reinstall=False, extra=False):
_("Downloading") + str(" [ {:>" + str(lndig) + "} / {} ] => [{}]").format(order.index(x) + 1, len(order),
x), color="yellow")
install_op = atomicoperations.Install.from_name(x)
install_op.store_postops()
paths.append(install_op.package_fname)
if x in extra_packages or (extra and x in A):
......@@ -123,6 +122,7 @@ def install_pkg_names(A, reinstall=False, extra=False):
remove_op.run_preremove()
for path in paths:
install_op = atomicoperations.Install(path)
install_op.store_postops()
install_op.preinstall()
for path in paths:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment