diff options
| author | Martin Sivak <msivak@redhat.com> | 2010-03-02 13:30:22 +0100 |
|---|---|---|
| committer | Martin Sivak <msivak@redhat.com> | 2010-03-02 13:30:22 +0100 |
| commit | 33be13225adbf83bc0f8b842ff5f476fcb60b7db (patch) | |
| tree | 2386aab9dea7d1f6c3c84a33b060deb178b70f12 | |
| parent | abc3971c7946fcb591d968efa50547f7067f6ded (diff) | |
| download | firstaidkit-33be13225adbf83bc0f8b842ff5f476fcb60b7db.tar.gz firstaidkit-33be13225adbf83bc0f8b842ff5f476fcb60b7db.tar.xz firstaidkit-33be13225adbf83bc0f8b842ff5f476fcb60b7db.zip | |
Update paths in default configuration
Add /usr/share prefixes for architecture independent data
| -rw-r--r-- | etc/firstaidkit/firstaidkit.conf | 6 | ||||
| -rw-r--r-- | pyfirstaidkit/configuration.py | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/etc/firstaidkit/firstaidkit.conf b/etc/firstaidkit/firstaidkit.conf index 0fd4040..2279de9 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/lib64/firstaidkit/frontend' '/usr/lib/firstaidkit/frontend' +# frontend = '/usr/lib64/firstaidkit/frontend' '/usr/lib/firstaidkit/frontend' '/usr/share/firstaidkit/frontend' # # configuration: @@ -95,3 +95,7 @@ flags = "filesystem" # lib: #lib/firstaidkit-plugins/examples = /usr/lib/firstaidkit/plugins/examples #lib/firstaidkit-plugins/examples/plugin_examples = /usr/lib/firstaidkit/plugins/examples/plugin_examples +# +# share: +#share/firstaidkit-plugins/examples = /usr/share/firstaidkit/plugins/examples +#share/firstaidkit-plugins/examples/plugin_examples = /usr/share/firstaidkit/plugins/examples/plugin_examples diff --git a/pyfirstaidkit/configuration.py b/pyfirstaidkit/configuration.py index cb8c5ea..ca1e1c9 100644 --- a/pyfirstaidkit/configuration.py +++ b/pyfirstaidkit/configuration.py @@ -60,7 +60,8 @@ def createDefaultConfig(config): # Frontend modules are in specified directories config.system.frontend = ("'/usr/lib64/firstaidkit/frontend' " - "'/usr/lib/firstaidkit/frontend'") + "'/usr/lib/firstaidkit/frontend' " + "'/usr/share/firstaidkit/frontend' ") # # There will be 4 default places where FAK will look for plugins, @@ -69,7 +70,7 @@ def createDefaultConfig(config): # config.add_section("paths") for dir in ["firstaidkit/plugins", "firstaidkit/plugins/examples"]: - for root in [ "usr/lib64", "usr/lib"]: + for root in [ "usr/lib64", "usr/lib", "usr/share"]: if os.path.exists( "/%s/%s" % (root,dir)): config.set( "paths", "%s/%s"%(dir[19:], root[4:]), |