summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-09-03 15:24:57 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-09-03 15:24:57 +0000
commitd9181e69c5d65a225ddba5d57d8d67de34e7bb22 (patch)
treebb8cb682af9a6d3da7d49bb7f1403e3c5c1a2c58
parent5d953ed0d8f61343940d410c4bb2cdfd17278fa3 (diff)
downloadurpmi-d9181e69c5d65a225ddba5d57d8d67de34e7bb22.tar
urpmi-d9181e69c5d65a225ddba5d57d8d67de34e7bb22.tar.gz
urpmi-d9181e69c5d65a225ddba5d57d8d67de34e7bb22.tar.bz2
urpmi-d9181e69c5d65a225ddba5d57d8d67de34e7bb22.tar.xz
urpmi-d9181e69c5d65a225ddba5d57d8d67de34e7bb22.zip
inline _sync_raw()
-rw-r--r--urpm/download.pm23
1 files changed, 9 insertions, 14 deletions
diff --git a/urpm/download.pm b/urpm/download.pm
index e84b7aa9..5d6a9305 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -783,7 +783,15 @@ sub sync_rel {
my ($urpm, $medium, $rel_files, %options) = @_;
my @files = map { reduce_pathname("$medium->{url}/$_") } @$rel_files;
- _sync_raw($urpm, $medium, \@files, %options);
+
+ my $files_text = join(' ', map { url_obscuring_password($_) } @files);
+ $urpm->{debug} and $urpm->{debug}(N("retrieving %s", $files_text));
+
+ eval {
+ _sync_webfetch_raw($urpm, $medium, \@files, _all_options($urpm, $medium, \%options));
+ $urpm->{log}(N("retrieved %s", $files_text));
+ 1;
+ };
}
sub sync_url {
@@ -805,19 +813,6 @@ sub sync {
sync_url($urpm, $_, %options) foreach @$files;
}
-sub _sync_raw {
- my ($urpm, $medium, $files, %options) = @_;
-
- my $files_text = join(' ', map { url_obscuring_password($_) } @$files);
- $urpm->{debug} and $urpm->{debug}(N("retrieving %s", $files_text));
-
- eval {
- _sync_webfetch_raw($urpm, $medium, $files, _all_options($urpm, $medium, \%options));
- $urpm->{log}(N("retrieved %s", $files_text));
- 1;
- };
-}
-
sub get_content {
my ($urpm, $url) = @_;