Fix up bad merge
Signed-off-by: Martin J. Bligh <mbligh@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@2509 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/autoserv b/server/autoserv
index 28075e1..a67d2c2 100755
--- a/server/autoserv
+++ b/server/autoserv
@@ -1,21 +1,20 @@
#!/usr/bin/python -u
-# Copyright 2007-2008 Martin J. Bligh, Google Inc.
+# Copyright 2007-2008 Martin J. Bligh <mbligh@google.com>, Google Inc.
# Released under the GPL v2
"""
Run an control file through the server side engine
"""
+
import sys, os, re, traceback, signal, time
+
import common
from autotest_lib.server import server_job, utils, autoserv_parser
from autotest_lib.client.common_lib import debug
+
debug.configure(module='server')
-# send stdin to /dev/null
-dev_null = os.open(os.devnull, sys.stdin.fileno())
-os.dup2(dev_null, sys.stdin.fileno())
-os.close(dev_null)
class PidFileManager(object):
pid_file = None
@@ -166,12 +165,6 @@
parser.parser.print_help()
sys.exit(1)
- if os.path.exists(os.path.join(results, 'control.srv')):
- error = "Error: results directory already exists: %s\n" % results
- sys.stderr.write(error)
- sys.exit(1)
- print "Results placed in %s" % results
-
results = parser.options.results
if not parser.options.no_logging:
if not results: