Branch 'pykolab-0.5' - 3 commits - pykolab/setup pykolab/utils.py
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Sun Nov 25 14:25:42 CET 2012
pykolab/setup/__init__.py | 5 +++++
pykolab/setup/components.py | 5 +----
pykolab/utils.py | 1 -
3 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 1ea303d92a99011ad67552769c479134c3e66e67
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sun Nov 25 13:21:44 2012 +0000
Import os before using it
diff --git a/pykolab/setup/__init__.py b/pykolab/setup/__init__.py
index a544e2a..2d9fafe 100644
--- a/pykolab/setup/__init__.py
+++ b/pykolab/setup/__init__.py
@@ -17,6 +17,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
+import os
import sys
import pykolab
commit 96f3ff3e3d315980d3f36f5a622f15377e6bdefc
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sun Nov 25 12:38:44 2012 +0000
Move unlinking /tmp/kolab-setup-my.cnf from components to upper-level run call
diff --git a/pykolab/setup/__init__.py b/pykolab/setup/__init__.py
index cffe6b4..a544e2a 100644
--- a/pykolab/setup/__init__.py
+++ b/pykolab/setup/__init__.py
@@ -40,3 +40,7 @@ class Setup(object):
def run(self):
components.execute('_'.join(to_execute))
+
+ if os.path.exists('/tmp/kolab-setup-my.cnf'):
+ os.unlink('/tmp/kolab-setup-my.cnf')
+
diff --git a/pykolab/setup/components.py b/pykolab/setup/components.py
index d280372..a51c416 100644
--- a/pykolab/setup/components.py
+++ b/pykolab/setup/components.py
@@ -201,9 +201,6 @@ def execute(component_name, *args, **kw):
components[component_name]['function'](conf.cli_args, kw)
- if os.path.exists('/tmp/kolab-setup-my.cnf'):
- os.unlink('/tmp/kolab-setup-my.cnf')
-
def register_group(dirname, module):
components_base_path = os.path.join(os.path.dirname(__file__), module)
@@ -266,4 +263,4 @@ def register(component_name, func, group=None, description=None, aliases=[], aft
def not_yet_implemented(*args, **kw):
print _("Not yet implemented")
- sys.exit(1)
\ No newline at end of file
+ sys.exit(1)
commit 06627fd5289e9118e09559a2bebcd76113bd6cec
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sun Nov 25 12:48:00 2012 +0000
Remove the use of log from utils
diff --git a/pykolab/utils.py b/pykolab/utils.py
index 448aaba..4516297 100644
--- a/pykolab/utils.py
+++ b/pykolab/utils.py
@@ -379,7 +379,6 @@ def translate(mystring, locale_name='en_US'):
try:
locale.setlocale(locale.LC_ALL, (locale_name,locale_charset))
except:
- log.error(_("Could not set locale to %r,%r") % (local_name,locale_charset))
pass
command = [ '/usr/bin/iconv',
More information about the commits
mailing list