summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/lib/Server/Plugin.py12
-rw-r--r--src/lib/Server/Plugins/Metadata.py2
-rw-r--r--src/lib/Server/Plugins/Ohai.py2
3 files changed, 3 insertions, 13 deletions
diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py
index ee7ae7a53..2e4974a84 100644
--- a/src/lib/Server/Plugin.py
+++ b/src/lib/Server/Plugin.py
@@ -73,20 +73,10 @@ class Plugin(object):
if (flag is None) and self.debug_flag or flag:
self.logger.error(message)
- @staticmethod
- def make_path(path):
- p_comp = path.split('/')
- for i in range(2, len(p_comp) + 1):
- ppath = '/' + '/'.join(p_comp[1:i])
- try:
- os.stat(ppath)
- except:
- os.mkdir(ppath)
-
@classmethod
def init_repo(cls, repo):
path = "%s/%s" % (repo, cls.name)
- cls.make_path(path)
+ os.makedirs(path)
def shutdown(self):
self.running = False
diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py
index e7dd90f00..ab25a737c 100644
--- a/src/lib/Server/Plugins/Metadata.py
+++ b/src/lib/Server/Plugins/Metadata.py
@@ -108,7 +108,7 @@ class Metadata(Bcfg2.Server.Plugin.Plugin,
@classmethod
def init_repo(cls, repo, groups, os_selection, clients):
path = '%s/%s' % (repo, cls.name)
- cls.make_path(path)
+ os.makedirs(path)
open("%s/Metadata/groups.xml" %
repo, "w").write(groups % os_selection)
open("%s/Metadata/clients.xml" %
diff --git a/src/lib/Server/Plugins/Ohai.py b/src/lib/Server/Plugins/Ohai.py
index b20218792..02d6ef58b 100644
--- a/src/lib/Server/Plugins/Ohai.py
+++ b/src/lib/Server/Plugins/Ohai.py
@@ -43,7 +43,7 @@ class Ohai(Bcfg2.Server.Plugin.Plugin,
try:
os.stat(self.data)
except:
- self.make_path(self.data)
+ os.makedirs(self.data)
self.cache = OhaiCache(self.data)
def GetProbes(self, meta, force=False):