From 99f90762d34cd687267e4f3f684ff4a62493300b Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Mon, 19 Nov 2012 11:48:00 -0500 Subject: [PATCH] zephyr_mirror: Get rid of extra_mirror code -- it is no longer used. (imported from commit ab2a9cfcfa6a8c7615523ebb16864e9a4db05f3a) --- bots/zephyr_mirror.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/bots/zephyr_mirror.py b/bots/zephyr_mirror.py index 0906f62..7e2dfa8 100755 --- a/bots/zephyr_mirror.py +++ b/bots/zephyr_mirror.py @@ -162,8 +162,6 @@ def maybe_restart_mirroring_script(): logging.exception("") while True: try: - if bot_name == "extra_mirror.py": - os.execvp(os.path.join(options.root_path, "extra_mirror.py"), sys.argv) os.execvp(os.path.join(options.root_path, "user_root", "zephyr_mirror.py"), sys.argv) except: logger.exception("Error restarting mirroring script; trying again... Traceback:") @@ -742,10 +740,7 @@ or specify the --api-key-file option.""" % (options.api_key_file,))) # First check that there are no other bots running cmdline = " ".join(sys.argv) - if "extra_mirror" in cmdline: - bot_name = "extra_mirror.py" - else: - bot_name = "zephyr_mirror.py" + bot_name = "zephyr_mirror.py" if not options.test_mode: proc = subprocess.Popen(['pgrep', '-U', os.environ["USER"], "-f", bot_name], stdout=subprocess.PIPE,