From: James Yonan <james@openvpn.net>
Date: Fri, 25 Mar 2011 11:06:16 +0000 (+0000)
Subject: win/sign.py now accepts an optional tap-dir argument.
X-Git-Tag: v2.3-alpha1~211^2^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4e999389a8d4a2091309e96e47ba0ff7d627a07;p=thirdparty%2Fopenvpn.git

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