From 7dc4271bfb4f5cf9d1867f0bee3b1c220852fdd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eray=20=C3=96zkural?= Date: Sun, 9 Oct 2005 22:39:45 +0000 Subject: [PATCH] * load comariface only when necessary, to deal with those installs that don't have comar.py installed --- pisi/api.py | 10 +++++++--- pisi/install.py | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pisi/api.py b/pisi/api.py index e691fc80..5d3a8b95 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -35,7 +35,6 @@ import pisi.repodb import pisi.installdb from pisi.index import Index import pisi.cli -import pisi.comariface as comariface class Error(pisi.Error): pass @@ -476,8 +475,13 @@ def configure_pending(): order = G_f.topological_sort() order.reverse() #print order - for x in order: - comariface.run_postinstall(x) + try: + import pisi.comariface as comariface + for x in order: + comariface.run_postinstall(x) + except ImportError: + raise Error(_("COMAR: comard not fully installed")) + def info(package): if package.endswith(ctx.const.package_prefix): diff --git a/pisi/install.py b/pisi/install.py index 4b0c51a0..cf11d603 100644 --- a/pisi/install.py +++ b/pisi/install.py @@ -36,7 +36,6 @@ import pisi.operations as operations from pisi.specfile import * from pisi.package import Package from pisi.metadata import MetaData -import pisi.comariface as comariface #import conflicts class Error(pisi.Error): @@ -66,6 +65,7 @@ class Installer: self.store_pisi_files() if ctx.comard: self.register_comar_scripts() + import pisi.comariface as comariface comariface.run_postinstall(self.pkginfo.name) self.update_databases()