summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2011-02-12 02:37:53 +0000
committerChristian Ruppert <idl0r@gentoo.org>2011-02-12 02:37:53 +0000
commit88b82dd7b18bac673ea7cce3c4a9a8e101d495da (patch)
tree7655d0760b994915888c5dc7797ef105442d6949 /net-analyzer/nagstamon/files
parentVersion bump to 0.9.5-rc1. (diff)
downloadgentoo-2-88b82dd7b18bac673ea7cce3c4a9a8e101d495da.tar.gz
gentoo-2-88b82dd7b18bac673ea7cce3c4a9a8e101d495da.tar.bz2
gentoo-2-88b82dd7b18bac673ea7cce3c4a9a8e101d495da.zip
Fix resource loading properly, Add missing __init__.py.
(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)
Diffstat (limited to 'net-analyzer/nagstamon/files')
-rw-r--r--net-analyzer/nagstamon/files/nagstamon-0.9.5-resources.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/net-analyzer/nagstamon/files/nagstamon-0.9.5-resources.patch b/net-analyzer/nagstamon/files/nagstamon-0.9.5-resources.patch
new file mode 100644
index 000000000000..8eef3a5be689
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon-0.9.5-resources.patch
@@ -0,0 +1,18 @@
+--- nagstamon.py.old 2011-02-12 03:33:35.154930846 +0100
++++ nagstamon.py 2011-02-12 03:34:08.100522965 +0100
+@@ -32,13 +32,8 @@ conf = Config()
+ # check for old settings when upgrading from a nagstamon version < 0.8 and convert them
+ conf.Convert_Conf_to_Multiple_Servers()
+
+-# try to get resources path if nagstamon got be installed by setup.py
+-try:
+- import pkg_resources
+- Resources = pkg_resources.resource_filename("Nagstamon", "resources")
+-except Exception, err:
+- # set resources to "" in case there are no resources available from setup.py
+- Resources = ""
++# set resources to "" in case there are no resources available from setup.py
++Resources = "/usr/share/nagstamon/resources"
+
+ # Resources on MacOS X, environment variable _MEIPASS2 comes from pyinstaller packed executable
+ # - does not really work at the moment