From a2b7edf03bf423fbcdd7a258d6254d3ed49c5672 Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Fri, 27 Apr 2007 21:07:45 +0000 Subject: Fixed installed package check in server.py svn path=/trunk/webapp-config/; revision=37 --- WebappConfig/config.py | 3 ++- WebappConfig/server.py | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/WebappConfig/config.py b/WebappConfig/config.py index 5b4cd10..2cae885 100644 --- a/WebappConfig/config.py +++ b/WebappConfig/config.py @@ -1491,7 +1491,8 @@ class Config: return allowed_servers[server](directories, self.create_permissions(), handlers, - flags) + flags, + pm = self.config.get('USER', 'package_manager')) def create_permissions(self): diff --git a/WebappConfig/server.py b/WebappConfig/server.py index fc22330..8fb4ad5 100644 --- a/WebappConfig/server.py +++ b/WebappConfig/server.py @@ -45,7 +45,8 @@ class Basic: directories, permissions, handler, - flags): + flags, + pm): if self.dep and not self.supported(): OUT.die('Your configuration file sets the server type "' + self.name @@ -79,6 +80,8 @@ class Basic: self.__handler = handler self.__flags = flags + self.__pm = pm + self.__ws = handler['source'] self.__content = handler['content'] self.__protect = handler['protect'] @@ -298,7 +301,7 @@ class Basic: # I don't think we should be forcing to have a webserver installed -- rl03 # Maybe, but the test should then be disabled somewhere else. # Reverted back to the original version for now -- wrobel - if self.dep and package_installed(self.dep): + if self.dep and package_installed(self.dep, self.__pm): return True return False -- cgit v1.2.3-65-gdbad