From: JINMEI Tatuya Date: Wed, 24 Oct 2012 21:27:02 +0000 (-0700) Subject: [2297] (unrelated cleanup) don't bother to rename() it to be more standaalone X-Git-Tag: trac2487_base~32^2~2^2~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54a03955995437e3cb380ef5ffba44d61be04213;p=thirdparty%2Fkea.git [2297] (unrelated cleanup) don't bother to rename() it to be more standaalone rename() sysinfo doesn't make much sense anyway, because it's a short-lived process. --- diff --git a/src/bin/sysinfo/run_sysinfo.sh.in b/src/bin/sysinfo/run_sysinfo.sh.in index c7688d5ea3..b6b0c88d8c 100755 --- a/src/bin/sysinfo/run_sysinfo.sh.in +++ b/src/bin/sysinfo/run_sysinfo.sh.in @@ -20,6 +20,9 @@ export PYTHON_EXEC SYSINFO_PATH=@abs_top_builddir@/src/bin/sysinfo +# Note: we shouldn't need log_messages except for the seemingly necessary +# dependency due to the automatic import in the isc package (its __init__.py +# imports some other modules) PYTHONPATH=@abs_top_builddir@/src/lib/python:@abs_top_srcdir@/src/lib/python:@abs_top_builddir@/src/lib/python/isc/log_messages export PYTHONPATH diff --git a/src/bin/sysinfo/sysinfo.py.in b/src/bin/sysinfo/sysinfo.py.in index 24cf309a31..90204cd7a6 100755 --- a/src/bin/sysinfo/sysinfo.py.in +++ b/src/bin/sysinfo/sysinfo.py.in @@ -22,11 +22,8 @@ ISC sysinfo program. import sys; sys.path.append ('@@PYTHONPATH@@') import getopt -import isc.util.process from isc.sysinfo import * -isc.util.process.rename() - def usage(): print("Usage: %s [-h] [-o ]" % sys.argv[0], \ file=sys.stderr)