From 44f589ba23b45894a5e4b9876a68159f7ff3b2bc Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Tue, 7 Dec 2004 17:20:45 +0000
Subject: Remove support for urpmi -X

---
 urpm/args.pm | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'urpm')

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}});
 }
 
-- 
cgit v1.2.1