-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 18/11/10 17:07, Samuli Seppänen wrote: | |> Samuli Seppänen wrote: |> |>> here's the next version of the patch; |>> |> |> Functionally fine! |> |> |> |>> def main(config): |>> + |>> + # Do a signed build by default |>> + unsignedBuild=False |>> |> |> Maybe name the option signedBuild instead? :) |> |> |> |>> + # Check if the SignTool module is present. This avoids ImportErrors popping |>> + # up annoyingly _after_ the build. |>> + if unsignedBuild == False: |>> + try: |>> + from signtool import SignTool |>> + except (ImportError): |>> + print "ERROR: SignTool python module not found! Can't do a signed build." |>> + sys.exit(1) |>> + |>> + if unsignedBuild == True: |>> + print "Doing an unsigned build as requested" |>> |> |> I guess the pythonic way would be simply: |> |> if signedBuild: |> try import.. |> else: |> print as requested.. |> |> |> |>> - sign(config, 'all') |>> + |>> + if unsignedBuild == False: |>> + sign(config, 'all') |>> + |>> |> |> signedBuild would be nicer, then simply: |> |> if signedBuild: |> sign() |> |> |> //Peter |> | | All fixes applied in this patch. |
Applied to bugfix2.1 and merged into allmerged and beta2.2. commit f20c2f0d6b42f652f39c0082237c3f8d69752ec9 Author: Samuli Seppänen <sam...@openvpn.net> List-Post: openvpn-devel@lists.sourceforge.net Date: Thu Nov 18 18:00:54 2010 +0200 ~ Added command-line option parser and an unsigned build option to ~ build_all.py ~ Modified win/build_all.py so that it parses command-line options using ~ getopt. Added option "-u / --unsigned" which allows forcing unsigned ~ builds and a "-h / --help" option. By default a signed build is ~ generated, provided that the Python SignTool module is installed. If not, ~ the build is interrupted. ~ Signed-off-by: Samuli Seppänen <sam...@openvpn.net> ~ Acked-by: Peter Stuge <pe...@stuge.se> ~ Signed-off-by: David Sommerseth <d...@users.sourceforge.net> Kind regards, David Sommerseth -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/ iEYEARECAAYFAkzljwYACgkQDC186MBRfrot4QCeI5+9fPykjKgnq1YaiKJ8NOxv Po4Anj1+e1455f4uPJo4+Zml6W8IhKQi =sRCX -----END PGP SIGNATURE-----
