summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-03-13 10:21:15 -0300
committerTomás Touceda <chiiph@leap.se>2013-03-13 10:21:15 -0300
commit12d2835c7d1f3c3d11eaa587b2196c104e6859e7 (patch)
tree47dd63b13781ae3d54fc3e26669d17489b5af7a0
parentb15f28b73afc31fd4176bee1a615e4095b0f4479 (diff)
Add mkdir_p method to util.files
-rw-r--r--src/leap/config/baseconfig.py10
-rw-r--r--src/leap/services/eip/eipbootstrapper.py12
-rw-r--r--src/leap/services/eip/providerbootstrapper.py10
-rw-r--r--src/leap/util/files.py41
4 files changed, 47 insertions, 26 deletions
diff --git a/src/leap/config/baseconfig.py b/src/leap/config/baseconfig.py
index 0386c294..538a47f0 100644
--- a/src/leap/config/baseconfig.py
+++ b/src/leap/config/baseconfig.py
@@ -22,7 +22,6 @@ Implements the abstract base class for configuration
import logging
import functools
import os
-import errno
import copy
from abc import ABCMeta, abstractmethod
@@ -30,6 +29,7 @@ from abc import ABCMeta, abstractmethod
from leap.config.prefixers import get_platform_prefixer
from leap.config.pluggableconfig import PluggableConfig
from leap.util.check import leap_assert
+from leap.util.files import mkdir_p
logger = logging.getLogger(__name__)
@@ -92,13 +92,7 @@ class BaseConfig:
@return: True if saved to disk correctly, False otherwise
"""
config_path = os.path.join(self.get_path_prefix(), *(path_list[:-1]))
- try:
- os.makedirs(config_path)
- except OSError as e:
- if e.errno == errno.EEXIST and os.path.isdir(config_path):
- pass
- else:
- raise
+ mkdir_p(config_path)
try:
self._config_checker.serialize(os.path.join(config_path,
diff --git a/src/leap/services/eip/eipbootstrapper.py b/src/leap/services/eip/eipbootstrapper.py
index 84a309cb..3e4e2063 100644
--- a/src/leap/services/eip/eipbootstrapper.py
+++ b/src/leap/services/eip/eipbootstrapper.py
@@ -22,7 +22,6 @@ EIP bootstrapping
import requests
import logging
import os
-import errno
from PySide import QtGui, QtCore
@@ -31,7 +30,7 @@ from leap.config.providerconfig import ProviderConfig
from leap.services.eip.eipconfig import EIPConfig
from leap.util.check import leap_assert, leap_assert_type
from leap.util.checkerthread import CheckerThread
-from leap.util.files import check_and_fix_urw_only, get_mtime
+from leap.util.files import check_and_fix_urw_only, get_mtime, mkdir_p
from leap.util.request_helpers import get_content
logger = logging.getLogger(__name__)
@@ -184,14 +183,7 @@ class EIPBootstrapper(QtCore.QObject):
# TODO: check certificate validity
- try:
- os.makedirs(os.path.dirname(client_cert_path))
- except OSError as e:
- if e.errno == errno.EEXIST and \
- os.path.isdir(os.path.dirname(client_cert_path)):
- pass
- else:
- raise
+ mkdir_p(os.path.dirname(client_cert_path))
with open(client_cert_path, "w") as f:
f.write(client_cert)
diff --git a/src/leap/services/eip/providerbootstrapper.py b/src/leap/services/eip/providerbootstrapper.py
index 4fdd9b8d..df56110e 100644
--- a/src/leap/services/eip/providerbootstrapper.py
+++ b/src/leap/services/eip/providerbootstrapper.py
@@ -31,7 +31,7 @@ from PySide import QtGui, QtCore
from leap.config.providerconfig import ProviderConfig
from leap.util.check import leap_assert, leap_assert_type
from leap.util.checkerthread import CheckerThread
-from leap.util.files import check_and_fix_urw_only, get_mtime
+from leap.util.files import check_and_fix_urw_only, get_mtime, mkdir_p
from leap.util.request_helpers import get_content
logger = logging.getLogger(__name__)
@@ -271,13 +271,7 @@ class ProviderBootstrapper(QtCore.QObject):
cert_dir = os.path.dirname(cert_path)
- try:
- os.makedirs(cert_dir)
- except OSError as e:
- if e.errno == errno.EEXIST and os.path.isdir(cert_dir):
- pass
- else:
- raise
+ mkdir_p(cert_dir)
with open(cert_path, "w") as f:
f.write(res.content)
diff --git a/src/leap/util/files.py b/src/leap/util/files.py
index 8c7a5af3..97741433 100644
--- a/src/leap/util/files.py
+++ b/src/leap/util/files.py
@@ -1,7 +1,29 @@
+# -*- coding: utf-8 -*-
+# files.py
+# Copyright (C) 2013 LEAP
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+"""
+Implements file helper methods
+"""
+
import os
import stat
import logging
import time
+import errno
logger = logging.getLogger(__name__)
@@ -43,3 +65,22 @@ def get_mtime(filename):
return mtime
except OSError:
return None
+
+
+def mkdir_p(path):
+ """
+ Creates the path and all the intermediate directories that don't
+ exist
+
+ Might raise OSError
+
+ @param path: path to create
+ @type path: str
+ """
+ try:
+ os.makedirs(path)
+ except OSError as exc:
+ if exc.errno == errno.EEXIST and os.path.isdir(path):
+ pass
+ else:
+ raise