diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-10-12 19:05:19 -0700 |
---|---|---|
committer | Chris Larson <chris_larson@mentor.com> | 2010-10-13 17:20:10 -0700 |
commit | 14b7ca062d96ab6b44f1b2bd192649db36ae6263 (patch) | |
tree | 9e5e6886c85667b56760d9c091b4d00e572d4758 /classes | |
parent | 8b2cac31bec0b97c8bc66ff3e6d2c9903f2ae8dc (diff) | |
download | openembedded-14b7ca062d96ab6b44f1b2bd192649db36ae6263.tar.gz |
oe.process: pull some common bits over
Also update gitver to use the subprocess wrappers
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Diffstat (limited to 'classes')
-rw-r--r-- | classes/gitver.bbclass | 28 | ||||
-rw-r--r-- | classes/utils.bbclass | 53 |
2 files changed, 21 insertions, 60 deletions
diff --git a/classes/gitver.bbclass b/classes/gitver.bbclass index 445067ec80..b67a017dcd 100644 --- a/classes/gitver.bbclass +++ b/classes/gitver.bbclass @@ -9,35 +9,23 @@ GITVER = "${@get_git_pv('${S}', d)}" def get_git_pv(path, d, tagadjust=None): - from subprocess import Popen, PIPE import os from bb import error from bb.parse import mark_dependency + import oe.process gitdir = os.path.abspath(os.path.join(d.getVar("S", True), ".git")) - env = { "GIT_DIR": gitdir } - - def popen(cmd, **kwargs): - kwargs["stderr"] = PIPE - kwargs["stdout"] = PIPE - kwargs["env"] = env + def git(cmd): try: - pipe = Popen(cmd, **kwargs) - except OSError, e: - #error("Execution of %s failed: %s" % (cmd, e)) - return - - (stdout, stderr) = pipe.communicate(None) - if pipe.returncode != 0: - #error("Execution of %s failed: %s" % (cmd, stderr)) - return - return stdout.rstrip() + return oe_run(d, ["git"] + cmd, cwd=gitdir).rstrip() + except oe.process.CmdError, exc: + bb.fatal(str(exc)) # Force the recipe to be reparsed so the version gets bumped # if the active branch is switched, or if the branch changes. mark_dependency(d, os.path.join(gitdir, "HEAD")) - ref = popen(["git", "symbolic-ref", "HEAD"]) + ref = git(["symbolic-ref", "HEAD"]) if ref: reffile = os.path.join(gitdir, ref) if os.path.exists(reffile): @@ -54,9 +42,9 @@ def get_git_pv(path, d, tagadjust=None): if os.path.exists(tagdir): mark_dependency(d, tagdir) - ver = popen(["git", "describe", "--tags"], cwd=path) + ver = git(["describe", "--tags"]) if not ver: - ver = popen(["git", "rev-parse", "--short", "HEAD"], cwd=path) + ver = git(["rev-parse", "--short", "HEAD"]) if ver: return "0.0-%s" % ver else: diff --git a/classes/utils.bbclass b/classes/utils.bbclass index f7d6996090..82beeb964e 100644 --- a/classes/utils.bbclass +++ b/classes/utils.bbclass @@ -57,50 +57,23 @@ def is_machine_specific(d): if any(urldata.localpath.startswith(mp + "/") for mp in machinepaths): return True -def subprocess_setup(): - import signal - # Python installs a SIGPIPE handler by default. This is usually not what - # non-Python subprocesses expect. - signal.signal(signal.SIGPIPE, signal.SIG_DFL) +def oe_popen_env(d): + env = d.getVar("__oe_popen_env", False) + if env is None: + env = {} + for v in d.keys(): + if d.getVarFlag(v, "export"): + env[v] = d.getVar(v, True) or "" + d.setVar("__oe_popen_env", env) + return env def oe_run(d, cmd, **kwargs): - """Convenience function to run a command and return its output, raising an - exception when the command fails""" - from subprocess import PIPE - - options = { - "stdout": PIPE, - "stderr": PIPE, - "shell": True, - } - options.update(kwargs) - pipe = oe_popen(d, cmd, **options) - stdout, stderr = pipe.communicate() - if pipe.returncode != 0: - raise RuntimeError("Execution of '%s' failed with '%s':\n%s" % - (cmd, pipe.returncode, stderr)) - return stdout + kwargs["env"] = oe_popen_env(d) + return oe.process.run(cmd, **kwargs) def oe_popen(d, cmd, **kwargs): - """ Convenience function to call out processes with our exported - variables in the environment. - """ - from subprocess import Popen - - if kwargs.get("env") is None: - env = d.getVar("__oe_popen_env", False) - if env is None: - env = {} - for v in d.keys(): - if d.getVarFlag(v, "export"): - env[v] = d.getVar(v, True) or "" - d.setVar("__oe_popen_env", env) - kwargs["env"] = env - - kwargs["close_fds"] = True - kwargs["preexec_fn"] = subprocess_setup - - return Popen(cmd, **kwargs) + kwargs["env"] = oe_popen_env(d) + return oe.process.popen(cmd, **kwargs) def oe_system(d, cmd, **kwargs): """ Popen based version of os.system. """ |