From 34af72d66a5b969f32aeed59a8a393931c1b9eed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eray=20=C3=96zkural?= Date: Sun, 25 Dec 2005 00:16:43 +0000 Subject: [PATCH] * fix: set config_later to True in case there are any comar scripts to configure. (hopefully no typo!) --- pisi/api.py | 1 + pisi/atomicoperations.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pisi/api.py b/pisi/api.py index 37467231..3c22f213 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -208,6 +208,7 @@ def configure_pending(): comariface.register(pcomar, x, scriptPath) # FIXME: we need a full package info here! # Eray, please fix this + # your wish is a command, darling -- eray pkginfo.name = x ctx.ui.notify(pisi.ui.configuring, package = pkginfo, files = None) comariface.run_postinstall(x) diff --git a/pisi/atomicoperations.py b/pisi/atomicoperations.py index 55816121..5acd2454 100644 --- a/pisi/atomicoperations.py +++ b/pisi/atomicoperations.py @@ -102,12 +102,17 @@ class Install(AtomicOperation): self.check_reinstall() self.extract_install() self.store_pisi_files() - if self.metadata.package.providesComar and ctx.comar: - import pisi.comariface as comariface - self.register_comar_scripts() self.config_later = False + if self.metadata.package.providesComar: + if ctx.comar: + import pisi.comariface as comariface + self.register_comar_scripts() + else: + self.config_later = True # configure-pending will register scripts later + + if 'System.Package' in [x.om for x in self.metadata.package.providesComar]: if ctx.comar: ctx.ui.notify(pisi.ui.configuring, package = self.pkginfo, files = self.files) comariface.run_postinstall(self.pkginfo.name)