This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via 58a60fde7432a8276ec821019d401fa6e0e46dc4 (commit) via 4732029a723f69870eee80886cb04bb6d00f671e (commit) from e4a79d86036678baa00f1d93273cde035e9e158a (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 58a60fde7432a8276ec821019d401fa6e0e46dc4 Merge: 4732029a723f69870eee80886cb04bb6d00f671e e4a79d86036678baa00f1d93273cde035e9e158a Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 19 15:24:02 2010 +0100

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit 4732029a723f69870eee80886cb04bb6d00f671e Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 19 14:50:42 2010 +0100

naoki: Do not log everything by default.

-----------------------------------------------------------------------

Summary of changes: naoki/util.py | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)

Difference in files: diff --git a/naoki/util.py b/naoki/util.py index a514a8a..5898727 100644 --- a/naoki/util.py +++ b/naoki/util.py @@ -126,8 +126,7 @@ def condPersonality(per=None): if res == -1: raise OSError(_errno.value, os.strerror(_errno.value))

-def do(command, shell=False, chrootPath=None, cwd=None, timeout=0, raiseExc=True, returnOutput=0, personality=None, *args, **kargs): - logger = kargs.get("logger", getLog()) +def do(command, shell=False, chrootPath=None, cwd=None, timeout=0, raiseExc=True, returnOutput=0, personality=None, logger=None, *args, **kargs): output = "" start = time.time() env = kargs.get("env", None) @@ -138,7 +137,8 @@ def do(command, shell=False, chrootPath=None, cwd=None, timeout=0, raiseExc=True

try: child = None - logger.debug("Executing command: %s" % command) + if logger: + logger.debug("Executing command: %s" % command) child = subprocess.Popen( command, shell=shell, @@ -149,7 +149,7 @@ def do(command, shell=False, chrootPath=None, cwd=None, timeout=0, raiseExc=True preexec_fn = preexec, env=env ) - + # use select() to poll for output so we dont block output = logOutput([child.stdout, child.stderr], logger, returnOutput, start, timeout) @@ -178,7 +178,8 @@ def do(command, shell=False, chrootPath=None, cwd=None, timeout=0, raiseExc=True if not niceExit: raise commandTimeoutExpired, ("Timeout(%s) expired for command:\n # %s\n%s" % (timeout, command, output))

- logger.debug("Child returncode was: %s" % str(child.returncode)) + if logger: + logger.debug("Child returncode was: %s" % str(child.returncode)) if raiseExc and child.returncode: if returnOutput: raise Error, ("Command failed: \n # %s\n%s" % (command, output), child.returncode)

hooks/post-receive -- IPFire 3.x development tree