summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-07-10 15:54:12 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-07-10 15:54:12 +0000
commit4903bd0f237e5ecabc35f2187708a1c0e1f5957b (patch)
tree10e7cec6d9045b1daeb17be4c01e18a5a69eb906
parent4d5572640e9e23da5ad90cf56a77f09329a521df (diff)
downloadurpmi-4903bd0f237e5ecabc35f2187708a1c0e1f5957b.tar
urpmi-4903bd0f237e5ecabc35f2187708a1c0e1f5957b.tar.gz
urpmi-4903bd0f237e5ecabc35f2187708a1c0e1f5957b.tar.bz2
urpmi-4903bd0f237e5ecabc35f2187708a1c0e1f5957b.tar.xz
urpmi-4903bd0f237e5ecabc35f2187708a1c0e1f5957b.zip
shut up the "adding medium "Virtual"" when using --synthesis or --use-distrib
-rw-r--r--urpm/media.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/urpm/media.pm b/urpm/media.pm
index d1dc8644..ab9c6760 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -569,11 +569,11 @@ sub configure {
(dirname($synthesis), basename($synthesis));
$urpm->{media} = [];
- add_medium($urpm, 'Virtual', $url, $with, %options, virtual => 1);
+ add_medium($urpm, 'Virtual', $url, $with, %options, virtual => 1, on_the_fly => 1);
}
} elsif ($options{usedistrib}) {
$urpm->{media} = [];
- add_distrib_media($urpm, "Virtual", $options{usedistrib}, %options, 'virtual' => 1);
+ add_distrib_media($urpm, "Virtual", $options{usedistrib}, %options, virtual => 1, on_the_fly => 1);
} else {
read_config($urpm);
if (!$options{media} && $urpm->{options}{'default-media'}) {
@@ -693,7 +693,7 @@ sub _compute_flags_for_instlist {
#- add a new medium, sync the config file accordingly.
#- returns the new medium's name. (might be different from the requested
#- name if index_name was specified)
-#- options: ignore, index_name, nolock, update, virtual, media_info_dir, mirrorlist, with-dir, xml-info
+#- options: ignore, index_name, nolock, update, virtual, media_info_dir, mirrorlist, with-dir, xml-info, on_the_fly
sub add_medium {
my ($urpm, $name, $url, $with_synthesis, %options) = @_;
@@ -758,13 +758,13 @@ sub add_medium {
@{$urpm->{media}} = map {
if (!_local_file($_) && !$inserted) {
$inserted = 1;
- $urpm->{info}(N("adding medium \"%s\" before remote medium \"%s\"", $name, $_->{name}) . $ignore_text);
+ $urpm->{$options{on_the_fly} ? 'log': 'info'}(N("adding medium \"%s\" before remote medium \"%s\"", $name, $_->{name}) . $ignore_text);
$medium, $_;
} else { $_ }
} @{$urpm->{media}};
}
if (!$inserted) {
- $urpm->{info}(N("adding medium \"%s\"", $name) . $ignore_text);
+ $urpm->{$options{on_the_fly} ? 'log': 'info'}(N("adding medium \"%s\"", $name) . $ignore_text);
push @{$urpm->{media}}, $medium;
}