From 8704f6f9d0caf6f90690d9aaf1a79be52d0a352c Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Wed, 2 Jan 2013 14:20:22 -0500 Subject: [PATCH] zmirror: Fix running on 32 bit systems. (This also needs pyzephyr to be compiled for 32 bit). (imported from commit 06e33e17be517483213d402dd75ec2ac168395d1) --- bots/zephyr_mirror_backend.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bots/zephyr_mirror_backend.py b/bots/zephyr_mirror_backend.py index 67472de..fc0c4ce 100755 --- a/bots/zephyr_mirror_backend.py +++ b/bots/zephyr_mirror_backend.py @@ -797,10 +797,11 @@ if __name__ == "__main__": # The 'api' directory needs to go first, so that 'import humbug' won't pick # up some other directory named 'humbug'. + pyzephyr_lib_path = "python-zephyr/build/lib.linux-" + os.uname()[4] + "-2.6/" sys.path[:0] = [os.path.join(options.root_path, 'api'), options.root_path, os.path.join(options.root_path, "python-zephyr"), - os.path.join(options.root_path, "python-zephyr/build/lib.linux-x86_64-2.6/")] + os.path.join(options.root_path, pyzephyr_lib_path)] # In case this is an automated restart of the mirroring script, # and we have lost AFS tokens, first try reading the API key from