From 3ec070c5d8c16a593ab2573f0f63d58a748ba2c1 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 12 Oct 2009 11:03:14 +0300 Subject: [PATCH] Output dependency type on --requires etc queries if verbose (RhBug:528342) --- rpmpopt.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rpmpopt.in b/rpmpopt.in index a9b22b4..4b8dd52 100644 --- a/rpmpopt.in +++ b/rpmpopt.in @@ -51,17 +51,17 @@ rpm alias --setugids -q --qf \ --POPTdesc=$"set user/group ownership of files in a package" rpm alias --conflicts --qf \ - "[%{CONFLICTNAME} %{CONFLICTFLAGS:depflags} %{CONFLICTVERSION}\n]" \ + "[%|VERBOSE?{%{CONFLICTFLAGS:deptype}: }:{}|%{CONFLICTNAME} %{CONFLICTFLAGS:depflags} %{CONFLICTVERSION}\n]" \ --POPTdesc=$"list capabilities this package conflicts with" rpm alias --obsoletes --qf \ - "[%{OBSOLETENAME} %|OBSOLETEFLAGS?{%{OBSOLETEFLAGS:depflags} %{OBSOLETEVERSION}}:{}|\n]" \ + "[%|VERBOSE?{%{OBSOLETEFLAGS:deptype}: }:{}|%{OBSOLETENAME} %|OBSOLETEFLAGS?{%{OBSOLETEFLAGS:depflags} %{OBSOLETEVERSION}}:{}|\n]" \ --POPTdesc=$"list other packages removed by installing this package" rpm alias --provides --qf \ - "[%{PROVIDENAME} %|PROVIDEFLAGS?{%{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}}:{}|\n]" \ + "[%|VERBOSE?{%{PROVIDEFLAGS:deptype}: }:{}|%{PROVIDENAME} %|PROVIDEFLAGS?{%{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}}:{}|\n]" \ --POPTdesc=$"list capabilities that this package provides" rpm alias --requires --qf \ - "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" \ + "[%|VERBOSE?{%{REQUIREFLAGS:deptype}: }:{}|%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" \ --POPTdesc=$"list capabilities required by package(s)" rpm alias -R --requires -- 2.7.4