aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Yonan <james@openvpn.net>2011-03-25 11:06:16 +0000
committerDavid Sommerseth <dazo@users.sourceforge.net>2011-04-26 22:29:11 +0200
commit1f001994070267d9d9016f0e5f13302de31e1284 (patch)
tree98f556976bd7512441398b8c5677fcca5736173a
parentVersion 2.1.3n (diff)
downloadopenvpn-1f001994070267d9d9016f0e5f13302de31e1284.tar.xz
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
-rw-r--r--win/sign.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/win/sign.py b/win/sign.py
index ee4ae72..9376951 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)