summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-10-29 16:33:26 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-10-29 16:33:26 +0000
commit5e10932dd221d5ff4033337baee57b3e630946ba (patch)
treeb2b6d75f975833214213626ab89b1f39a666c4fa
parentdbfc6fa31b17191bc618727a2752ceab163ab4bb (diff)
downloadurpmi-5e10932dd221d5ff4033337baee57b3e630946ba.tar
urpmi-5e10932dd221d5ff4033337baee57b3e630946ba.tar.gz
urpmi-5e10932dd221d5ff4033337baee57b3e630946ba.tar.bz2
urpmi-5e10932dd221d5ff4033337baee57b3e630946ba.tar.xz
urpmi-5e10932dd221d5ff4033337baee57b3e630946ba.zip
drop obsolete stuff
it should have been dropped in commit: : r14827 | rgarciasuarez | 2005-02-17 16:01:39 +0100 (Thu, 17 Feb 2005) | 2 lines : Remove obsoleted and broken --distrib-XXX command-line option
-rw-r--r--pod/urpmi.addmedia.8.pod7
-rw-r--r--pod/urpmi.files.5.pod7
-rw-r--r--urpm/args.pm1
-rw-r--r--urpm/cfg.pm13
-rwxr-xr-xurpmi.addmedia11
5 files changed, 1 insertions, 38 deletions
diff --git a/pod/urpmi.addmedia.8.pod b/pod/urpmi.addmedia.8.pod
index c4a4f5b2..c7d223a6 100644
--- a/pod/urpmi.addmedia.8.pod
+++ b/pod/urpmi.addmedia.8.pod
@@ -186,13 +186,6 @@ to B<--root>, the urpmi configuration comes from the rooted tree.
If the urpmi or rpm db is busy, wait until it is available
-=item B<--from> I<url>
-
-Use specified URL for list of mirrors. The default is taken from the file
-F</etc/urpmi/mirror.config>, or
-F<http://www.mandrivalinux.com/mirrorsfull.list> if this file doesn't
-exist.
-
=item B<--virtual>
Creates a virtual medium: the medium is always up-to-date and so it does not
diff --git a/pod/urpmi.files.5.pod b/pod/urpmi.files.5.pod
index 5d16400e..a726acc8 100644
--- a/pod/urpmi.files.5.pod
+++ b/pod/urpmi.files.5.pod
@@ -59,13 +59,6 @@ of packages against.
Vendor specific version of similar to prefer.list.
-=item I</etc/urpmi/mirror.config>
-
-This file is optional. If present, it should contain a single line:
-B<url=http://....> which is the URL of a document that lists the available
-mirrors. The default is to use
-F<http://www.mandrivalinux.com/mirrorsfull.list>.
-
=item I</etc/urpmi/netrc>
This file is handled by urpmi: when adding a media from an URL containing a
diff --git a/urpm/args.pm b/urpm/args.pm
index e5db95a3..5a6ff129 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -345,7 +345,6 @@ my %options_spec = (
'mirrorlist:s' => sub { $options{mirrorlist} = $_[1] || '$MIRRORLIST' },
interactive => sub { $options{interactive} = 1 },
'all-media' => sub { $options{allmedia} = 1 },
- 'from=s' => \$options{mirrors_url},
virtual => \$options{virtual},
nopubkey => \$options{nopubkey},
raw => \$options{raw},
diff --git a/urpm/cfg.pm b/urpm/cfg.pm
index a06c3557..8619eda9 100644
--- a/urpm/cfg.pm
+++ b/urpm/cfg.pm
@@ -319,19 +319,6 @@ sub write_ini_config {
}
}
-#- routines to handle mirror list location
-
-#- Default mirror list
-our $mirrors = 'http://www.mandrivalinux.com/mirrorsfull.list';
-
-sub mirrors_cfg () {
- foreach (cat_("/etc/urpmi/mirror.config")) {
- chomp; s/#.*$//; s/^\s*//; s/\s*$//;
- /^url\s*=\s*(.*)/ and $mirrors = $1;
- }
- return 1;
-}
-
1;
__END__
diff --git a/urpmi.addmedia b/urpmi.addmedia
index a073c81c..bfc637ba 100755
--- a/urpmi.addmedia
+++ b/urpmi.addmedia
@@ -74,9 +74,7 @@ and [options] are from
medium.
") . N(" --interactive - with --distrib, ask confirmation for each media
") . N(" --all-media - with --distrib, add every listed media
-") . N(" --from - use specified url for list of mirrors, the default is
- %s
-", $urpm::cfg::mirrors) . N(" --virtual - create virtual media wich are always up-to-date.
+") . N(" --virtual - create virtual media wich are always up-to-date.
") . N(" --no-md5sum - disable MD5SUM file checking.
") . N(" --nopubkey - don't import pubkey of added media
") . N(" --raw - add the media in config, but don't update it.
@@ -90,13 +88,6 @@ and [options] are from
$ENV{PATH} = "/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin";
delete @ENV{qw(ENV BASH_ENV IFS CDPATH)};
-#- parse /etc/urpmi/mirror.config if present, or use default mdk mirror.
-#- the --from option overrides this setting.
-if ($options{mirrors_url}) {
- $urpm::cfg::mirrors = $options{mirrors_url};
-} else {
- urpm::cfg::mirrors_cfg();
-}
$options{force} = 0;
my $urpm = urpm->new_parse_cmdline or usage();