win/sign.py now accepts an optional tap-dir argument.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7086 e7ae566f-a301-0410-adde-c780ea21d3b5

diff --git a/win/sign.py b/win/sign.py
index ee4ae72dda65298b0e967b00901f5b447426fd14..93769514aea725a0766af7c3ea3ff93b3ef87284 100644 (file)
--- a/win/sign.py
+++ b/win/sign.py
@@ -4,16 +4,20 @@ from wb import config, choose_arch, home_fn
 if 'SIGNTOOL' in config:\r
     sys.path.append(home_fn(config['SIGNTOOL']))\r
 \r
-def main(conf, arch):\r
+def main(conf, arch, tap_dir):\r
     from signtool import SignTool\r
-    st = SignTool(conf)\r
+    st = SignTool(conf, tap_dir)\r
     for x64 in choose_arch(arch):\r
         st.sign_verify(x64=x64)\r
 \r
 # if we are run directly, and not loaded as a module\r
 if __name__ == "__main__":\r
     if len(sys.argv) >= 2:\r
-        main(config, sys.argv[1])\r
+        if len(sys.argv) >= 3:\r
+            tap_dir = home_fn(sys.argv[2])\r
+        else:\r
+            tap_dir = None\r
+        main(config, sys.argv[1], tap_dir)\r
     else:\r
-        print "usage: sign <x64|x86|all>"\r
+        print "usage: sign <x64|x86|all> [tap-dir]"\r
         sys.exit(2)\r