Address cl requests in pr-103;
This commit is contained in:
parent
bd794526b7
commit
7f3d7a46e4
1 changed files with 7 additions and 5 deletions
|
|
@ -511,7 +511,10 @@ def DownloadFileTo( url, destination, file_name = None, checksum = None, sslchec
|
||||||
print( "Downloading {} to {}/{}".format( url, destination, file_name ) )
|
print( "Downloading {} to {}/{}".format( url, destination, file_name ) )
|
||||||
|
|
||||||
if not sslcheck:
|
if not sslcheck:
|
||||||
kwargs = {"context": ssl._create_unverified_context()}
|
context = ssl.create_default_context()
|
||||||
|
context.check_hostname = False
|
||||||
|
context.verify_mode = ssl.CERT_NONE
|
||||||
|
kwargs = { "context": context }
|
||||||
else:
|
else:
|
||||||
kwargs = {}
|
kwargs = {}
|
||||||
|
|
||||||
|
|
@ -669,10 +672,9 @@ for name, gadget in GADGETS.items():
|
||||||
'(when supplying --all)'.format( name, lang ) )
|
'(when supplying --all)'.format( name, lang ) )
|
||||||
|
|
||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
"--no-ssl",
|
"--no-check-certificate",
|
||||||
action = "store_true",
|
action = "store_true",
|
||||||
help = "Switch the gadget download ssl certificate verification"
|
help = "Do not verify SSL certificates for file downloads."
|
||||||
"off (use only in you have a self-signed certificate in your chain)"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
@ -706,7 +708,7 @@ for name, gadget in GADGETS.items():
|
||||||
destination = os.path.join( gadget_dir, 'download', name, v[ 'version' ] )
|
destination = os.path.join( gadget_dir, 'download', name, v[ 'version' ] )
|
||||||
|
|
||||||
url = string.Template( gadget[ 'download' ][ 'url' ] ).substitute( v )
|
url = string.Template( gadget[ 'download' ][ 'url' ] ).substitute( v )
|
||||||
verify_cert_off = getattr(args, "no_ssl")
|
verify_cert_off = args.no_check_certificate
|
||||||
|
|
||||||
file_path = DownloadFileTo(
|
file_path = DownloadFileTo(
|
||||||
url,
|
url,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue