Add an -f option to rpm-find-leaves (show fullnames)

2 files changed, 75 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index bbd9035b..d5483377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,67 @@
+2006-07-11 09:57  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* pod/urpme.8.pod, pod/urpmi.8.pod, pod/urpmi.cfg.5.pod: Mention
+	  urpmi.recover in more urpm* manpages
+
+2006-07-11 09:51  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* pod/urpmi.recover.8.pod: Additions to the man page for
+	  urpmi.recover
+
+2006-07-09 01:36  Thierry Vignaud <tvignaud at mandriva.com>
+
+	* po/br.po: update
+
+2006-07-05 16:23  Thierry Vignaud <tvignaud at mandriva.com>
+
+	* urpm.pm: (update_media) don't die if the same file is encoutered
+	  twice
+
+2006-07-04 11:22  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* urpmi: Allow to install deps of an srpm via rurpmi (patch by
+	  Pascal Terjan, bug #23250)
+
+2006-06-30 12:13  Thierry Vignaud <tvignaud at mandriva.com>
+
+	* po/br.po: update
+
+2006-06-30 12:06  Thierry Vignaud <tvignaud at mandriva.com>
+
+	* po/af.po, po/ar.po, po/az.po, po/bg.po, po/bn.po, po/br.po,
+	  po/bs.po, po/ca.po, po/cs.po, po/cy.po, po/da.po, po/de.po,
+	  po/el.po, po/eo.po, po/es.po, po/et.po, po/eu.po, po/fa.po,
+	  po/fi.po, po/fr.po, po/fur.po, po/ga.po, po/gl.po, po/he.po,
+	  po/hi.po, po/hr.po, po/hu.po, po/id.po, po/is.po, po/it.po,
+	  po/ja.po, po/ka.po, po/ko.po, po/ky.po, po/lt.po, po/lv.po,
+	  po/mk.po, po/mn.po, po/ms.po, po/mt.po, po/nb.po, po/nl.po,
+	  po/nn.po, po/pa_IN.po, po/pl.po, po/pt.po, po/pt_BR.po,
+	  po/ro.po, po/ru.po, po/sc.po, po/sk.po, po/sl.po, po/sq.po,
+	  po/sr.po, po/sr@Latn.po, po/sv.po, po/tg.po, po/th.po, po/tl.po,
+	  po/tr.po, po/uk.po, po/urpmi.pot, po/uz.po, po/uz@Latn.po,
+	  po/vi.po, po/wa.po, po/zh_CN.po, po/zh_TW.po: sync with code
+
+2006-06-30 12:04  Thierry Vignaud <tvignaud at mandriva.com>
+
+	* urpm.pm: fix encoding which prevented xgettext to process
+
+2006-06-28 10:52  Pablo Saratxaga <pablo at mandriva.com>
+
+	* po/gl.po: updated po file
+
+2006-06-20 15:28  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* ChangeLog, urpm.pm, urpmi.spec: Release 4.8.21
+
+2006-06-20 15:20  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* urpmi: Remove old rpm db log files when restarting one self
+
+2006-06-20 13:54  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* urpmi: Don't ignore modified but unselected media on
+	  auto-update. (bug #22354)
+
 2006-06-20 15:20  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
 
 	* urpmi: Remove old rpm db log files when restarting one self
diff --git a/rpm-find-leaves b/rpm-find-leaves
index 765d0eaa..6af1ef3e 100644
--- a/rpm-find-leaves
+++ b/rpm-find-leaves
@@ -16,6 +16,7 @@ where [options] are from
 ", $0) . N("   -h|--help      - print this help message.
 ") . N("   --root <path>  - use the given root instead of /
 ") . N("   -g [group]     - restrict results to specified group.
+") . N("   -f             - output rpm full name (NVRA)
 ") . N("                    defaults to %s.
 ", $options{group});
 
@@ -33,6 +34,7 @@ while ($_ = shift) {
 	$options{group} = $group;
 	next;
     };
+    $_ eq '-f' and do { $options{fullname} = 1; next };
     print $usage; exit 0;
 }
 
@@ -50,7 +52,7 @@ my %l;
 my %provides;
 foreach my $pkg (@packages) {
     next if $options{restrict_group} && $pkg->group !~ /\Q$options{group}/oi;
-    $l{$pkg->name} = 1;
+    $l{$pkg->name} = $pkg;
     push @{$provides{$_}}, $pkg->name foreach $pkg->provides_nosense;
 }
 
@@ -58,4 +60,11 @@ foreach my $pkg (@packages) {
     delete @l{grep { $_ ne $pkg->name } @{$provides{$_} || []}} foreach $pkg->requires_nosense;
 }
 
-print "$_\n" foreach sort keys %l;
+if ($options{fullname}) {
+    foreach my $k (sort keys %l) {
+	my $l = $l{$k};
+	print $l->name, '-', $l->version, '-', $l->release, '.', $l->arch, "\n";
+    }
+} else {
+    print "$_\n" foreach sort keys %l;
+}