[tor-commits] [flashproxy/master] Split out if block for flashproxy-reg-appspot.

[dcf at torproject.org]

commit 02a307b7fe7d0c2f858cc596aaa2a2850abeb7f8
Author: David Fifield <david at bamsoftware.com>
Date:   Sat May 18 22:57:53 2013 -0700

    Split out if block for flashproxy-reg-appspot.
---
 flashproxy-client |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/flashproxy-client b/flashproxy-client
index 7fc36fa..69405d0 100755
--- a/flashproxy-client
+++ b/flashproxy-client
@@ -963,8 +963,13 @@ def build_register_command(method):
         af = ["-4"]
     elif options.address_family == socket.AF_INET6:
         af = ["-6"]
-    if method in ["email", "appspot"]:
-        command = [os.path.join(script_dir, "flashproxy-reg-" + method)] + af
+    if method == "appspot":
+        command = [os.path.join(script_dir, "flashproxy-reg-appspot"] + af
+        if options.facilitator_pubkey_filename is not None:
+            command += ["--facilitator-pubkey", options.facilitator_pubkey_filename]
+        return command
+    elif method == "email":
+        command = [os.path.join(script_dir, "flashproxy-reg-email"] + af
         if options.facilitator_pubkey_filename is not None:
             command += ["--facilitator-pubkey", options.facilitator_pubkey_filename]
         return command