[gentoo-commits] gentoo-x86 commit in app-portage/epm/files: 1.33-epm-310475.patch

[Paul Varner (fuzzyray)]

fuzzyray    12/05/11 21:33:33

  Added:                1.33-epm-310475.patch
  Log:
  Add patch from Alexander Miller to fix epm -qi output. Bug 310475
  Fix implicit RDEPEND in stable epm-1.33 ebuild.
  Remove unused epm-0.9.1 ebuild.
  
  (Portage version: 2.1.10.58/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-portage/epm/files/1.33-epm-310475.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/epm/files/1.33-epm-310475.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/epm/files/1.33-epm-310475.patch?rev=1.1&content-type=text/plain

Index: 1.33-epm-310475.patch
===================================================================
Fix "Use of uninitialized value in printf" warning
http://bugs.gentoo.org/310475
Patch from Alexander Miller

--- epm
+++ epm
@@ -189,7 +189,7 @@
     my ($p) = @_;
     my ($group, $ename) = $p =~ /^(.+?)\/(.+)$/;
     my ($key, $value);
-    my %vals;
+    my %vals = map {$_, '(n/a)'} qw/CATEGORY HOSTNAME DESCRIPTION URL LICENSE NAME RELEASE VERSION SLOT PACKAGER/;
     my $ldbpath = "$dbpath/$p";
     my $fmt = <<EOT;
 Name        : \%s
@@ -206,7 +206,7 @@
     open(F, "bzcat $ldbpath/environment.bz2|")
 	or die "epm: Can't open $ldbpath/environment.bz2: $!\n";
     while (<F>) {
-	next unless (/^(CATEGORY|HOSTNAME|DESCRIPTION|HOMEPAGE|LICENSE|PN|PR|PV|SLOT)=(.*)/);
+	next unless (/^(?:declare\s+(?:-[x-]\s+)*)?(CATEGORY|HOSTNAME|DESCRIPTION|HOMEPAGE|LICENSE|PN|PR|PV|SLOT)=(.*)/);
 	($key, $value) = ($1, $2);
 	if ($key eq 'PN') {
 	    $key = 'NAME';
@@ -221,6 +221,7 @@
 	}
 	# Clean up the double and single quotes
 	$value =~ s/^'(.*)'$/$1/o;
+	$value =~ s/^"(.*)"$/$1/o;
 	$value =~ s/'\\''/'/go;
 	$value =~ s/\\"/"/go;