From d90e305277a60edcb97438e1f7fee005bcbad70b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 14 Jan 2008 13:18:13 +0000
Subject:   o deprecate "urpmq -R" and "urpmq -RR"

---
 NEWS         | 1 +
 urpm/args.pm | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 40aacba2..6df578b3 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
   o fix --license
 - urpmq:
   o add --sourcerpm
+  o deprecate "urpmq -R" and "urpmq -RR"
 
 Version 5.0 - 11 January 2008, by Pascal "Pixel" Rigaux
 
diff --git a/urpm/args.pm b/urpm/args.pm
index 56b744f2..751893ae 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -251,8 +251,12 @@ my %options_spec = (
 	g => \$options{group},
 	'whatprovides|p' => \$options{use_provides},
 	P => sub { $options{use_provides} = 0 },
-	'whatrequires|R' => sub { $options{what_requires} and $options{what_requires_recursive} = 1; 
-				   $options{what_requires} = 1 },
+	R => sub { $urpm->{error}($options{what_requires} ?
+				    "option -RR is deprecated, use --whatrequires-recursive instead" : 
+				    "option -R is deprecated, use --whatrequires instead");
+	           $options{what_requires} and $options{what_requires_recursive} = 1; 
+		   $options{what_requires} = 1 },
+	whatrequires => sub { $options{what_requires} = 1 },
 	'whatrequires-recursive' => sub { $options{what_requires_recursive} = $options{what_requires} = 1 },
 	y => sub { $urpm->{options}{fuzzy} = 1; $options{all} = 1 },
 	Y => sub { $urpm->{options}{fuzzy} = 1; $options{all} = $options{caseinsensitive} = 1 },
-- 
cgit v1.2.1