diff options
| author | Christophe Fergeau <cfergeau@mandriva.com> | 2009-09-25 16:15:45 +0000 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@mandriva.com> | 2009-09-25 16:15:45 +0000 |
| commit | 2423ddc80cfb7c1c55e7041d3df3564f36450bf8 (patch) | |
| tree | 2e928c042b997f53b81b749633bc3b0037848e35 | |
| parent | 462a37745715f70a4d2597e53e18b58b12a2b33d (diff) | |
| download | urpmi-2423ddc80cfb7c1c55e7041d3df3564f36450bf8.tar urpmi-2423ddc80cfb7c1c55e7041d3df3564f36450bf8.tar.gz urpmi-2423ddc80cfb7c1c55e7041d3df3564f36450bf8.tar.bz2 urpmi-2423ddc80cfb7c1c55e7041d3df3564f36450bf8.tar.xz urpmi-2423ddc80cfb7c1c55e7041d3df3564f36450bf8.zip | |
default to checking certificates when dowloading data
| -rw-r--r-- | urpm/download.pm | 6 | ||||
| -rw-r--r-- | urpm/mirrors.pm | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/urpm/download.pm b/urpm/download.pm index 83c6767d..75a8b3d5 100644 --- a/urpm/download.pm +++ b/urpm/download.pm @@ -322,7 +322,7 @@ sub sync_wget { ($options->{callback} ? ("--progress=bar:force", "-o", "-") : $options->{quiet} ? "-q" : @{[]}), "--retr-symlinks", - ($options->{"strict-certificate-check"} ? () : "--no-check-certificate"), + ($options->{"no-certificate-check"} ? "--no-check-certificate" : ()), "--timeout=$CONNECT_TIMEOUT", (defined $options->{'wget-options'} ? split /\s+/, $options->{'wget-options'} : ()), '-P', $options->{dir}, @@ -470,7 +470,7 @@ sub sync_curl { ($options->{proxy} ? set_proxy({ type => "curl", proxy => $options->{proxy} }) : ()), ($options->{retry} ? ('--retry', $options->{retry}) : ()), ($options->{quiet} ? "-s" : @{[]}), - ($options->{"strict-certificate-check"} ? () : "-k"), + ($options->{"no-certificate-check"} ? "-k" : ()), $location_trusted ? "--location-trusted" : @{[]}, "-R", "-f", @@ -683,7 +683,7 @@ sub sync_aria2 { ($options->{'limit-rate'} ? "--max-download-limit=" . $options->{'limit-rate'} : ()), ($options->{resume} ? "--continue" : "--allow-overwrite=true"), ($options->{proxy} ? set_proxy({ type => "aria2", proxy => $options->{proxy} }) : ()), - ($options->{"strict-certificate-check"} ? () : "--check-certificate=false"), + ($options->{"no-certificate-check"} ? "--check-certificate=false" : ()), (defined $options->{'aria2-options'} ? split /\s+/, $options->{'aria2-options'} : ()), _create_metalink_($urpm, $medium, $rel_files, $options)); diff --git a/urpm/mirrors.pm b/urpm/mirrors.pm index 48b77542..f17240b2 100644 --- a/urpm/mirrors.pm +++ b/urpm/mirrors.pm @@ -274,7 +274,7 @@ sub _mirrors_raw { my ($urpm, $url) = @_; $urpm->{log}(N("getting mirror list from %s", $url)); - my @l = urpm::download::get_content($urpm, $url, "strict-certificate-check" => 1) or $urpm->{error}("mirror list not found"); + my @l = urpm::download::get_content($urpm, $url) or $urpm->{error}("mirror list not found"); @l; } |