summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-12-07 17:20:45 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-12-07 17:20:45 +0000
commit44f589ba23b45894a5e4b9876a68159f7ff3b2bc (patch)
tree94105229a0e5d426c283984c6ededc0da7f12458 /urpm
parentf1b7de1a02d8921f0944fae945eb2b05335dcac0 (diff)
downloadurpmi-44f589ba23b45894a5e4b9876a68159f7ff3b2bc.tar
urpmi-44f589ba23b45894a5e4b9876a68159f7ff3b2bc.tar.gz
urpmi-44f589ba23b45894a5e4b9876a68159f7ff3b2bc.tar.bz2
urpmi-44f589ba23b45894a5e4b9876a68159f7ff3b2bc.tar.xz
urpmi-44f589ba23b45894a5e4b9876a68159f7ff3b2bc.zip
Remove support for urpmi -X
Diffstat (limited to 'urpm')
-rw-r--r--urpm/args.pm9
1 files changed, 0 insertions, 9 deletions
diff --git a/urpm/args.pm b/urpm/args.pm
index 10da6b9b..a1e9d9af 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -102,11 +102,7 @@ my %options_spec = (
},
'bug=s' => \$options{bug},
'env=s' => \$::env,
- X => \$options{X},
WID => \$::WID,
- 'best-output' => sub {
- $options{X} ||= $ENV{DISPLAY} && system('/usr/X11R6/bin/xtest', '') == 0
- },
'verify-rpm!' => sub { $urpm->{options}{'verify-rpm'} = $_[1] },
'strict-arch!' => sub { $urpm->{options}{'strict-arch'} = $_[1] },
'norebuild!' => sub { $urpm->{options}{norebuild} = $_[1] },
@@ -311,12 +307,7 @@ foreach my $k ("help|h", "wget", "curl", "proxy=s", "proxy-user=s", "c", "f", "z
sub parse_cmdline {
my %args = @_;
- # set up global urpm object
$urpm = $args{urpm};
- # parse options
- if ($tool eq 'urpmi') {
- foreach (@ARGV) { $_ = '-X' if $_ eq '--X' }
- }
GetOptions(%{$options_spec{$tool}});
}