summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2009-02-24 18:26:38 +0100
committerRené 'Necoro' Neumann <necoro@necoro.net>2009-02-24 18:26:38 +0100
commitc768119cc7ade2018f7ab0ae0da0515bee36de60 (patch)
tree8846cd07eb121d0d332d92efd5e20fe5f1ae5baa
parent8e3257caa9f70192794d9594feb0da489bdfc720 (diff)
parent3f02f33cc7bd3546453d22d072131218d5cdc1d0 (diff)
downloadportato-c768119cc7ade2018f7ab0ae0da0515bee36de60.tar.gz
portato-c768119cc7ade2018f7ab0ae0da0515bee36de60.tar.bz2
portato-c768119cc7ade2018f7ab0ae0da0515bee36de60.zip
More 0.12 stuff
-rw-r--r--portato/constants.py2
-rw-r--r--portato/db/__init__.py3
-rw-r--r--portato/plistener.py2
3 files changed, 3 insertions, 4 deletions
diff --git a/portato/constants.py b/portato/constants.py
index 937dea5..f188897 100644
--- a/portato/constants.py
+++ b/portato/constants.py
@@ -61,7 +61,7 @@ HOME = os.environ["HOME"]
SU_COMMAND = "gksu -D 'Portato'"
# config
-CONFIG_DIR = "/etc/portato/"
+CONFIG_DIR = "etc/"
CONFIG_LOCATION = pjoin(CONFIG_DIR, "portato.cfg")
SESSION_DIR = pjoin(os.environ["HOME"], ".portato")
diff --git a/portato/db/__init__.py b/portato/db/__init__.py
index f83659c..da8a81e 100644
--- a/portato/db/__init__.py
+++ b/portato/db/__init__.py
@@ -38,8 +38,7 @@ def Database(type):
from .sql import SQLDatabase
except ImportError:
warning(_("Cannot load SQLDatabase."))
- _TYPE = "dict"
- return Database(type)
+ return Database("dict")
else:
return SQLDatabase(SectionDict(_SESSION, "SQL"))
diff --git a/portato/plistener.py b/portato/plistener.py
index 349cf03..4a248ab 100644
--- a/portato/plistener.py
+++ b/portato/plistener.py
@@ -48,7 +48,7 @@ class PListener (object):
self._rw.V()
data = string.split("\0")
- debug("Listner received: %s", data)
+ debug("Listener received: %s", data)
if data[0] == "notify":
self.do_notify(*data[1:])