summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Harring <ferringb@gentoo.org>2005-12-27 06:12:38 +0000
committerBrian Harring <ferringb@gentoo.org>2005-12-27 06:12:38 +0000
commitb0afeaed8babd2f1f7a347cf2551cb342c770996 (patch)
tree82300367bc7bc9cf5e740698f007110ab0e51f1e
parentlinear unique_array lifted from saviour, lifted from a python cookbook. (diff)
downloadportage-multirepo-b0afeaed8babd2f1f7a347cf2551cb342c770996.tar.gz
portage-multirepo-b0afeaed8babd2f1f7a347cf2551cb342c770996.tar.bz2
portage-multirepo-b0afeaed8babd2f1f7a347cf2551cb342c770996.zip
whitespace corrections, single space between funcs, double between class blocks...
svn path=/main/trunk/; revision=2489
-rw-r--r--pym/portage_exec.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/pym/portage_exec.py b/pym/portage_exec.py
index 79afbf76..db3c8be3 100644
--- a/pym/portage_exec.py
+++ b/pym/portage_exec.py
@@ -16,11 +16,9 @@ try:
except ImportError:
max_fd_limit = 256
-
sandbox_capable = (os.path.isfile(SANDBOX_BINARY) and
os.access(SANDBOX_BINARY, os.X_OK))
-
def spawn_bash(mycommand, debug=False, opt_name=None, **keywords):
args = [BASH_BINARY]
if not opt_name:
@@ -32,7 +30,6 @@ def spawn_bash(mycommand, debug=False, opt_name=None, **keywords):
args.append(mycommand)
return spawn(args, opt_name=opt_name, **keywords)
-
def spawn_sandbox(mycommand, opt_name=None, **keywords):
if not sandbox_capable:
return spawn_bash(mycommand, opt_name=opt_name, **keywords)
@@ -42,7 +39,6 @@ def spawn_sandbox(mycommand, opt_name=None, **keywords):
args.append(mycommand)
return spawn(args, opt_name=opt_name, **keywords)
-
# We need to make sure that any processes spawned are killed off when
# we exit. spawn() takes care of adding and removing pids to this list
# as it creates and cleans up processes.
@@ -58,8 +54,8 @@ def cleanup():
# This pid has been cleaned up outside
# of spawn().
pass
-atexit.register(cleanup)
+atexit.register(cleanup)
def spawn(mycommand, env={}, opt_name=None, fd_pipes=None, returnpid=False,
uid=None, gid=None, groups=None, umask=None, logfile=None,
@@ -169,7 +165,6 @@ def spawn(mycommand, env={}, opt_name=None, fd_pipes=None, returnpid=False,
# Everything succeeded
return 0
-
def _exec(binary, mycommand, opt_name, fd_pipes, env, gid, groups, uid, umask):
# If the process we're creating hasn't been given a name
@@ -213,7 +208,6 @@ def _exec(binary, mycommand, opt_name, fd_pipes, env, gid, groups, uid, umask):
# And switch to the new process.
os.execve(binary, myargs, env)
-
def find_binary(binary):
for path in os.getenv("PATH", "").split(":"):
filename = "%s/%s" % (path, binary)