From c0235444db86ad87bf1f7ed404bb85df19c3e760 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 25 Feb 2008 14:19:36 +0000
Subject: - urpmq:   o add --conflicts

---
 NEWS                  | 1 +
 pod/urpmq.8.pod       | 4 ++++
 urpm/args.pm          | 1 +
 urpmi.bash-completion | 2 +-
 urpmq                 | 5 +++--
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 02a97067..383b2b02 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
 - urpmq:
+  o add --conflicts
   o --requires now display the raw requires, use --requires-recursive to get
     the old behaviour (#29176)
 - urpmf:
diff --git a/pod/urpmq.8.pod b/pod/urpmq.8.pod
index d4304098..9ac2fa94 100644
--- a/pod/urpmq.8.pod
+++ b/pod/urpmq.8.pod
@@ -204,6 +204,10 @@ If the urpmi or rpm db is busy, wait until it is available
 
 Prints the package changelog.
 
+=item B<--conflicts>
+
+Prints the package conflicts.
+
 =item B<--provides>
 
 Prints the package provides.
diff --git a/urpm/args.pm b/urpm/args.pm
index 7505e1e0..158f78f3 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -230,6 +230,7 @@ my %options_spec = (
 	keep => \$options{keep},
 	list => \$options{list},
 	changelog => \$options{changelog},
+	conflicts => \$options{conflicts},
 	provides => \$options{provides},
 	sourcerpm => \$options{sourcerpm},
 	'summary|S' => \$options{summary},
diff --git a/urpmi.bash-completion b/urpmi.bash-completion
index 603b6b7c..41449699 100644
--- a/urpmi.bash-completion
+++ b/urpmi.bash-completion
@@ -138,7 +138,7 @@ _urpmq()
 			--sortmedia --synthesis --auto-select --no-suggests --fuzzy --keep --nokeep \
 			--list --list-url --list-media --list-nodes --list-aliases \
 			--src --sources --provides --requires --summary --sourcerpm --force --parallel --wget --curl --prozilla \
-			--changelog --proxy --proxy-user --env --dump-config \
+			--changelog --conflicts --proxy --proxy-user --env --dump-config \
 			--whatprovides --whatrequires --whatrequires-recursive \
 			--skip --prefer \
 			--use-distrib --searchmedia --ignorearch" -- $cur))
diff --git a/urpmq b/urpmq
index c88cd268..4f53dcd4 100755
--- a/urpmq
+++ b/urpmq
@@ -78,6 +78,7 @@ usage:
                    authentication (format is <user:password>).
 ") . N("  --env          - use specific environment (typically a bug report).
 ") . N("  --changelog    - print changelog.
+") . N("  --conflicts    - print conflicts.
 ") . N("  --provides     - print provides.
 ") . N("  --requires     - print requires.
 ") . N("  --sourcerpm    - print sourcerpm.
@@ -447,8 +448,8 @@ if ($options{list_aliases}) {
 	    }
 	}
 	exit 0;
-    } elsif ($options{provides} || $options{requires}) {
-	my $get = $options{provides} ? 'provides' : 'requires';
+    } elsif ($options{provides} || $options{requires} || $options{conflicts}) {
+	my $get = $options{provides} ? 'provides' : $options{requires} ? 'requires' : 'conflicts';
 	my @l = uniq_ { scalar $_->fullname } map { $urpm->{depslist}[$_] } map { split /\|/, $_ } keys %{$state->{selected}};
 	foreach my $pkg (@l) {
 	    if (@l > 1) {
-- 
cgit v1.2.1