diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-09-03 13:31:37 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-09-03 13:31:37 +0000 |
| commit | 94cfc57850981b85f9fc027621a3439e9d36eb9b (patch) | |
| tree | 47c2b83cc6f5968824537933de69ac3c6a768cce /urpm | |
| parent | 20e09e364291f0b52f751c736282a790aad7442c (diff) | |
| download | urpmi-94cfc57850981b85f9fc027621a3439e9d36eb9b.tar urpmi-94cfc57850981b85f9fc027621a3439e9d36eb9b.tar.gz urpmi-94cfc57850981b85f9fc027621a3439e9d36eb9b.tar.bz2 urpmi-94cfc57850981b85f9fc027621a3439e9d36eb9b.tar.xz urpmi-94cfc57850981b85f9fc027621a3439e9d36eb9b.zip | |
create urpm::download::sync_url() and use it
Diffstat (limited to 'urpm')
| -rw-r--r-- | urpm/download.pm | 8 | ||||
| -rw-r--r-- | urpm/media.pm | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/urpm/download.pm b/urpm/download.pm index 244d6d72..c36cf62a 100644 --- a/urpm/download.pm +++ b/urpm/download.pm @@ -769,6 +769,12 @@ sub sync_rel { sync($urpm, $medium, \@files, %options); } +sub sync_url { + my ($urpm, $url, %options) = @_; + + sync($urpm, undef, [$url], %options); +} + #- $medium can be undef #- known options: quiet, resume, callback sub sync { @@ -801,7 +807,7 @@ sub get_content { my $file = "$urpm->{cachedir}/partial/" . basename($url); unlink $file; # prevent "partial file" errors - urpm::download::sync($urpm, undef, [ $url ], quiet => 1) or return; + sync_url($urpm, $url, quiet => 1) or return; my @l = cat_($file); unlink $file; diff --git a/urpm/media.pm b/urpm/media.pm index 269626fc..ca7e8c4b 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -906,8 +906,8 @@ sub _new_distribconf_and_download { $distribconf->settree('mandriva'); $urpm->{log}(N("retrieving media.cfg file...")); - urpm::download::sync($urpm, undef, - [ reduce_pathname($distribconf->getfullpath(undef, 'infodir') . '/media.cfg') ], + urpm::download::sync_url($urpm, + reduce_pathname($distribconf->getfullpath(undef, 'infodir') . '/media.cfg'), quiet => 1) or return; $distribconf; } |