Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/devbot
diff options
context:
space:
mode:
authorDaniel Narvaez <dwnarvaez@gmail.com>2012-12-26 01:31:10 (GMT)
committer Daniel Narvaez <dwnarvaez@gmail.com>2012-12-26 01:31:10 (GMT)
commitc6c2e37404b441e7bc7cfff1209c6d763a004d21 (patch)
tree67ddde11cafedf0901788932d80c8e6dfb9e6427 /devbot
parent9c29aca272054d1bc9f66eea9a1597fc3d4daa38 (diff)
Switch to aclocal 1.11
1.12 requires autoconf 2.59
Diffstat (limited to 'devbot')
-rw-r--r--devbot/build.py4
-rw-r--r--devbot/config.py21
-rw-r--r--devbot/utils.py8
3 files changed, 21 insertions, 12 deletions
diff --git a/devbot/build.py b/devbot/build.py
index 2a101e2..5ea9422 100644
--- a/devbot/build.py
+++ b/devbot/build.py
@@ -111,6 +111,10 @@ def _eval_option(option):
return eval(option, {"prefix": config.prefix_dir})
def _build_autotools(module, log):
+ # Workaround for aclocal 1.11 (fixed in 1.12)
+ aclocal_path = os.path.join(config.share_dir, "aclocal")
+ utils.ensure_dir(aclocal_path)
+
makefile_path = os.path.join(module.get_build_dir(), "Makefile")
if not os.path.exists(makefile_path):
diff --git a/devbot/config.py b/devbot/config.py
index 39efaa3..044c048 100644
--- a/devbot/config.py
+++ b/devbot/config.py
@@ -7,6 +7,7 @@ import tempfile
from devbot import distro
from devbot import plugins
from devbot import git
+from devbot import utils
config_dir = None
logs_dir = None
@@ -66,10 +67,6 @@ class Module:
"delete it and pull\nthe source again."
return None
-def _ensure_dir(dir):
- if not os.path.exists(dir):
- os.mkdir(dir)
-
def setup(**kwargs):
_load_plugins()
@@ -78,7 +75,7 @@ def setup(**kwargs):
global logs_dir
logs_dir = kwargs["logs_dir"]
- _ensure_dir(logs_dir)
+ utils.ensure_dir(logs_dir)
global _prefs_path
_prefs_path = kwargs.get("prefs_path", None)
@@ -98,18 +95,18 @@ def setup(**kwargs):
_setup_install_dir(kwargs["install_dir"], relocatable)
def _setup_state_dir(state_dir):
- _ensure_dir(state_dir)
+ utils.ensure_dir(state_dir)
global build_state_dir
build_state_dir = os.path.join(state_dir, "build")
- _ensure_dir(build_state_dir)
+ utils.ensure_dir(build_state_dir)
base_home_dir = os.path.join(state_dir, "home")
- _ensure_dir(base_home_dir)
+ utils.ensure_dir(base_home_dir)
global home_dir
home_dir = os.path.join(base_home_dir, get_pref("PROFILE"))
- _ensure_dir(home_dir)
+ utils.ensure_dir(home_dir)
def _setup_prefix_dir(dir, relocatable):
global prefix_dir
@@ -147,7 +144,7 @@ def _setup_install_dir(dir, relocatable=False):
global libexec_dir
install_dir = dir
- _ensure_dir(install_dir)
+ utils.ensure_dir(install_dir)
_setup_prefix_dir(dir, relocatable)
@@ -170,12 +167,12 @@ def _setup_install_dir(dir, relocatable=False):
def get_source_dir():
global _source_dir
- _ensure_dir(_source_dir)
+ utils.ensure_dir(_source_dir)
return _source_dir
def get_build_dir():
global _build_dir
- _ensure_dir(_build_dir)
+ utils.ensure_dir(_build_dir)
return _build_dir
def _read_prefs():
diff --git a/devbot/utils.py b/devbot/utils.py
index aed5de0..a8988f1 100644
--- a/devbot/utils.py
+++ b/devbot/utils.py
@@ -1 +1,9 @@
+import os
+
devnull = open("/dev/null", "w")
+
+def ensure_dir(path):
+ try:
+ os.mkdir(path)
+ except OSError:
+ pass