From 9eaffe1369f2be177576402f20edcd114a1eaa9d Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Sun, 9 Jun 2013 03:45:10 +0200
Subject: =?UTF-8?q?Fix=20the=20os.makedirs=20calls=20so=20that=20they=20do?=
 =?UTF-8?q?n=E2=80=99t=20traceback=20for=20nothing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config.py         | 2 +-
 src/logger.py         | 7 +++++--
 src/plugin_manager.py | 4 ++--
 src/theming.py        | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/config.py b/src/config.py
index 3e6c24f0..695362e5 100644
--- a/src/config.py
+++ b/src/config.py
@@ -243,7 +243,7 @@ if not CONFIG_HOME:
 CONFIG_PATH = path.join(CONFIG_HOME, 'poezio')
 
 try:
-    makedirs(CONFIG_PATH)
+    makedirs(CONFIG_PATH, exist_ok=True)
 except OSError:
     pass
 
diff --git a/src/logger.py b/src/logger.py
index 7df44a29..ba848593 100644
--- a/src/logger.py
+++ b/src/logger.py
@@ -56,14 +56,17 @@ class Logger(object):
             return
         directory = os.path.join(DATA_HOME, 'logs')
         try:
-            makedirs(directory)
+            makedirs(directory, exist_ok=True)
         except OSError:
-            pass
+            import traceback
+            log.debug('Cannot create log directory "%s":\n%s', directory, traceback.format_exc())
         try:
             fd = open(os.path.join(directory, room), 'a')
             self.fds[room] = fd
             return fd
         except IOError:
+            import traceback
+            log.debug('Cannot open logfile %s:\n%s', room, traceback.format_exc())
             return
 
     def get_logs(self, jid, nb=10):
diff --git a/src/plugin_manager.py b/src/plugin_manager.py
index 9e253f97..74d5a2d3 100644
--- a/src/plugin_manager.py
+++ b/src/plugin_manager.py
@@ -38,14 +38,14 @@ if not plugins_conf_dir:
 plugins_conf_dir = os.path.expanduser(plugins_conf_dir)
 
 try:
-    os.makedirs(plugins_dir)
+    os.makedirs(plugins_dir, exist_ok=True)
 except OSError:
     pass
 else:
     load_path.append(plugins_dir)
 
 try:
-    os.makedirs(plugins_conf_dir)
+    os.makedirs(plugins_conf_dir, exist_ok=True)
 except OSError:
     pass
 
diff --git a/src/theming.py b/src/theming.py
index c999ef2c..c26a4733 100644
--- a/src/theming.py
+++ b/src/theming.py
@@ -372,7 +372,7 @@ def reload_theme():
                      'poezio', 'themes')
     themes_dir = os.path.expanduser(themes_dir)
     try:
-        os.makedirs(themes_dir)
+        os.makedirs(themes_dir, exist_ok=True)
     except OSError:
         pass
     theme_name = config.get('theme', 'default')
-- 
cgit v1.2.3