Branch 'pykolab-0.5' - 2 commits - kolabd/kolabd.tmpfiles.d.conf pykolab.spec.in pykolab/utils.py wallace/wallace.tmpfiles.d.conf

[Jeroen van Meeuwen]

 kolabd/kolabd.tmpfiles.d.conf   |    2 ++
 pykolab.spec.in                 |    4 ++++
 pykolab/utils.py                |    3 ++-
 wallace/wallace.tmpfiles.d.conf |    2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 44569a17eec2a0bc5d31e4016d399d7db9206229
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Oct 1 15:40:49 2012 +0100

    Add tmpfiles.d configuration files

diff --git a/kolabd/kolabd.tmpfiles.d.conf b/kolabd/kolabd.tmpfiles.d.conf
new file mode 100644
index 0000000..ce98b6e
--- /dev/null
+++ b/kolabd/kolabd.tmpfiles.d.conf
@@ -0,0 +1,2 @@
+d /var/run/kolabd   750   kolab kolab
+
diff --git a/pykolab.spec.in b/pykolab.spec.in
index 90a8176..dff2481 100644
--- a/pykolab.spec.in
+++ b/pykolab.spec.in
@@ -150,6 +150,8 @@ mkdir -p %{buildroot}/%{_unitdir}
 %{__install} -p -m 644 kolabd/kolabd.systemd %{buildroot}/%{_unitdir}/kolabd.service
 %{__install} -p -m 644 saslauthd/kolab-saslauthd.systemd %{buildroot}/%{_unitdir}/kolab-saslauthd.service
 %{__install} -p -m 644 wallace/wallace.systemd %{buildroot}/%{_unitdir}/wallace.service
+%{__install} -p -m 644 kolabd/kolabd.tmpfiles.d.conf %{buildroot}/%{_sysconfdir}/tmpfiles.d/kolabd.conf
+%{__install} -p -m 644 wallace/wallace.tmpfiles.d.conf %{buildroot}/%{_sysconfdir}/tmpfiles.d/wallace.conf
 %else
 mkdir -p %{buildroot}/%{_initddir}
 %{__install} -p -m 755 kolabd/kolabd.sysvinit %{buildroot}/%{_initrddir}/kolabd
@@ -353,6 +355,7 @@ rm -rf %{buildroot}
 %doc AUTHORS ChangeLog COPYING
 %if 0%{?fedora} >= 15
 %{_unitdir}/kolabd.service
+%{_sysconfdir}/tmpfiles.d/kolabd.conf
 %else
 %{_initrddir}/kolabd
 %endif
@@ -371,6 +374,7 @@ rm -rf %{buildroot}
 %doc AUTHORS ChangeLog COPYING
 %if 0%{?fedora} >= 15
 %{_unitdir}/wallace.service
+%{_sysconfdir}/tmpfiles.d/wallaced.conf
 %else
 %{_initrddir}/wallace
 %endif
diff --git a/wallace/wallace.tmpfiles.d.conf b/wallace/wallace.tmpfiles.d.conf
new file mode 100644
index 0000000..7dd659a
--- /dev/null
+++ b/wallace/wallace.tmpfiles.d.conf
@@ -0,0 +1,2 @@
+d /var/run/wallaced   750   kolab kolab
+


commit 3434a5891e5e48b20a28431b9f20f2241cee4448
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Oct 1 12:52:32 2012 +0100

    Prevent traceback on undefined Error exception (#1014)

diff --git a/pykolab/utils.py b/pykolab/utils.py
index a4cb2e2..c74759b 100644
--- a/pykolab/utils.py
+++ b/pykolab/utils.py
@@ -352,7 +352,8 @@ def translate(mystring, locale_name='en_US'):
 
     try:
         locale.setlocale(locale.LC_ALL, (locale_name,locale_charset))
-    except Error, errmsg:
+    except:
+        log.error(_("Could not set locale to %r,%r") % (local_name,locale_charset))
         pass
 
     command = [ '/usr/bin/iconv',