5 commits - configure.ac pykolab.spec.in pykolab/utils.py

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Wed Jul 11 16:46:24 CEST 2012


 configure.ac     |    2 +-
 pykolab.spec.in  |    4 ++--
 pykolab/utils.py |   14 ++------------
 3 files changed, 5 insertions(+), 15 deletions(-)

New commits:
commit 6201e52c7701891b2f3a1ba91d51d338ef74cec4
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Jul 11 15:45:45 2012 +0100

    Import modules used,
    Avoid using log (not available),
    Avoid printing out information when it's irrelevant

diff --git a/pykolab/utils.py b/pykolab/utils.py
index 33fc3ca..3fb7e34 100644
--- a/pykolab/utils.py
+++ b/pykolab/utils.py
@@ -18,7 +18,9 @@
 #
 
 import getpass
+import grp
 import os
+import pwd
 import sys
 
 from pykolab import constants
@@ -154,13 +156,6 @@ def ensure_directory(_dir, _user='root', _group='root'):
 
                 # Set real and effective group if not the same as current.
                 if not group_gid == rgid:
-                    log.debug(
-                            _("Switching real and effective group id to %d") % (
-                                    group_gid
-                                ),
-                            level=8
-                        )
-
                     os.chown(_dir, -1, group_gid)
 
             if ruid == 0:
@@ -184,11 +179,6 @@ def ensure_directory(_dir, _user='root', _group='root'):
 
                 # Set real and effective user if not the same as current.
                 if not user_uid == ruid:
-                    print >> sys.stderr, \
-                        _("Switching real and effective user id to %d") % (
-                                user_uid
-                            )
-
                     os.chown(_dir, user_uid, -1)
 
     except:


commit 2ab8963285e34959005fbbc26a218443ed60c1a1
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Jul 11 15:28:23 2012 +0100

    Fix wallace %post (#873)

diff --git a/pykolab.spec.in b/pykolab.spec.in
index 8471321..5f69b96 100644
--- a/pykolab.spec.in
+++ b/pykolab.spec.in
@@ -246,9 +246,9 @@ if [ $1 -eq  1 ] ; then
 %endif
 else
 %if 0%{?fedora} >= 15
-    /sbin/service wallace condrestart
-%else
     /bin/systemctl reload-or-try-restart wallace.service
+%else
+    /sbin/service wallace condrestart
 %endif
 fi
 


commit f833da8067e29eb89ab9d9876fcd1a74afb5b503
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Jul 11 15:24:18 2012 +0100

    Bump pre-release

diff --git a/configure.ac b/configure.ac
index 1f38f21..1999797 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([pykolab], 0.5)
-AC_SUBST([RELEASE], 0.6)
+AC_SUBST([RELEASE], 0.7)
 
 AC_CONFIG_SRCDIR(pykolab/constants.py.in)
 


commit bd6da451f9428ae66a7980f5802392fe979c948f
Merge: 70e35ba 69bd973
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Jul 11 15:23:53 2012 +0100

    Merge branch 'master' of ssh://git.kolabsys.com/git/pykolab



commit 70e35ba03b22d60097c7371084d23bd1944fc069
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Jul 11 14:40:44 2012 +0100

    Bump pre-release

diff --git a/configure.ac b/configure.ac
index fd58469..1f38f21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([pykolab], 0.5)
-AC_SUBST([RELEASE], 0.5)
+AC_SUBST([RELEASE], 0.6)
 
 AC_CONFIG_SRCDIR(pykolab/constants.py.in)
 





More information about the commits mailing list