From 1c35f8bffe4d983383fd11e00fa53275ce3e4a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= Date: Fri, 30 Apr 2010 11:50:28 +0000 Subject: [PATCH] comariface: Fix failure when registering COMAR scripts If a package provides multiple scripts and a service script precedes another script, System.Service.registerState is called for that script although it is not a script. --- pisi/comariface.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pisi/comariface.py b/pisi/comariface.py index 20b1c771..1840724c 100644 --- a/pisi/comariface.py +++ b/pisi/comariface.py @@ -92,7 +92,6 @@ def post_install(package_name, provided_scripts, scriptpath, metapath, filepath, ctx.ui.info(_("Configuring %s package") % package_name) self_post = False - sys_service = False package_name = safe_package_name(package_name) @@ -107,13 +106,11 @@ def post_install(package_name, provided_scripts, scriptpath, metapath, filepath, script_name = script.name if script.name else package_name if script.om == "System.Package": self_post = True - elif script.om == "System.Service": - sys_service = True try: link.register(script_name, script.om, os.path.join(scriptpath, script.script)) except dbus.DBusException, exception: raise Error, _("Script error: %s") % exception - if sys_service: + if script.om == "System.Service": try: link.System.Service[script_name].registerState() except dbus.DBusException, exception: