summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Sivak <msivak@redhat.com>2008-04-24 14:47:22 +0200
committerMartin Sivak <msivak@redhat.com>2008-04-24 14:47:22 +0200
commit3fc73c4c5e631a39f0ba421c514f5af4cdca4e61 (patch)
treeb3110cbca1a4103c0125e46a13668c70a82d745d
parent4a5c1ae905ceb0599bdea7d113cfc659e9740832 (diff)
downloadfirstaidkit-3fc73c4c5e631a39f0ba421c514f5af4cdca4e61.tar.gz
firstaidkit-3fc73c4c5e631a39f0ba421c514f5af4cdca4e61.tar.xz
firstaidkit-3fc73c4c5e631a39f0ba421c514f5af4cdca4e61.zip
Look for frontend in multiple directories
-rw-r--r--etc/firstaidkit/firstaidkit.conf2
-rwxr-xr-xfirstaidkit3
-rw-r--r--pyfirstaidkit/configuration.py4
3 files changed, 5 insertions, 4 deletions
diff --git a/etc/firstaidkit/firstaidkit.conf b/etc/firstaidkit/firstaidkit.conf
index 9b92f75..afa975f 100644
--- a/etc/firstaidkit/firstaidkit.conf
+++ b/etc/firstaidkit/firstaidkit.conf
@@ -19,7 +19,7 @@
#
# frontend:
# Where to look for the frontend modules
-#frontend = /usr/lib/firstaidkit/frontend
+#frontend = /usr/lib64/firstaidkit/frontend /usr/lib/firstaidkit/frontend
#
# configuration:
diff --git a/firstaidkit b/firstaidkit
index 1cb4ef9..ec8ec38 100755
--- a/firstaidkit
+++ b/firstaidkit
@@ -213,7 +213,8 @@ if __name__=="__main__":
sys.exit(0)
#Add the frontend path to sys.path
- sys.path.insert(1, Config.system.frontend)
+ for idx,p in enumerate(Config.system._list("frontend")):
+ sys.path.insert(1+idx, p)
try:
import frontend_gtk
diff --git a/pyfirstaidkit/configuration.py b/pyfirstaidkit/configuration.py
index 9a4987b..a08b60d 100644
--- a/pyfirstaidkit/configuration.py
+++ b/pyfirstaidkit/configuration.py
@@ -51,8 +51,8 @@ def createDefaultConfig(config):
# Set the directory containing cfg bits for different services/packages
config.system.configuration = "/etc/firstaidkit"
- # Frontend modules are in specified directory
- config.system.frontend = "/usr/lib/firstaidkit/frontend"
+ # Frontend modules are in specified directories
+ config.system.frontend = "/usr/lib64/firstaidkit/frontend /usr/lib/firstaidkit/frontend"
#
# There will be 4 default places where FAK will look for plugins, these 4 names