summaryrefslogtreecommitdiffstats
path: root/urpm.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-07-25 15:43:44 +0000
committerFrancois Pons <fpons@mandriva.com>2003-07-25 15:43:44 +0000
commit1a7d1415ad7dab53d03ac0f58ae1741ceb71520c (patch)
treef19ccf621a18bfacd889e7af39038f454d342985 /urpm.pm
parentc95ab52aa93f5078e091c8248b90c31e247c350b (diff)
make sure no log are printed if using quiet download,
removed log about description file being downloaded.
Diffstat (limited to 'urpm.pm')
-rw-r--r--urpm.pm11
1 files changed, 4 insertions, 7 deletions
diff --git a/urpm.pm b/urpm.pm
index 7c8ac708..46f54fb3 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -196,7 +196,7 @@ sub sync_wget {
}
}
} else {
- print STDERR $buf;
+ ref($options) && $options->{quiet} or print STDERR $buf;
}
$buf = '';
}
@@ -238,7 +238,7 @@ sub sync_curl {
}
}
} else {
- print STDERR $buf;
+ ref($options) && $options->{quiet} or print STDERR $buf;
}
$buf = '';
}
@@ -277,7 +277,7 @@ sub sync_rsync {
propagate_sync_callback($options, 'progress', $file, $percent, undef, undef, $speed);
}
} else {
- print STDERR $buf;
+ ref($options) && $options->{quiet} or print STDERR $buf;
}
$buf = '';
}
@@ -319,7 +319,7 @@ sub sync_ssh {
propagate_sync_callback($options, 'progress', $file, $percent, undef, undef, $speed);
}
} else {
- print STDERR $buf;
+ ref($options) && $options->{quiet} or print STDERR $buf;
}
$buf = '';
}
@@ -1379,15 +1379,12 @@ this could happen if you mounted manually the directory when creating the medium
system("mv", "$urpm->{statedir}/descriptions.$medium->{name}", "$urpm->{cachedir}/partial/descriptions");
}
eval {
- $urpm->{log}(N("retrieving description file of \"%s\"...", $medium->{name}));
$urpm->{sync}({ dir => "$urpm->{cachedir}/partial",
quiet => 1,
limit_rate => $options{limit_rate},
proxy => $urpm->{proxy} },
reduce_pathname("$medium->{url}/../descriptions"));
- $urpm->{log}(N("...retrieving done"));
};
- $@ and $urpm->{log}(N("...retrieving failed: %s", $@));
if (-e "$urpm->{cachedir}/partial/descriptions") {
rename("$urpm->{cachedir}/partial/descriptions", "$urpm->{statedir}/descriptions.$medium->{name}") or
system("mv", "$urpm->{cachedir}/partial/descriptions", "$urpm->{statedir}/descriptions.$medium->{name}");