From 26a4878d6c5b03be939dfe06177a83f83f4ff83e Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Thu, 21 Aug 2003 09:46:40 +0000
Subject: really fixed bad content generated.

---
 perl-install/pkgs.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 4faeb8131..c99bae118 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -422,13 +422,13 @@ sub psUsingHdlist {
 	    $block .= $_;
 	    if ($inside_block =~ /E/) {
 		push @{$m->{pubkey}}, { block => $block, content => $content };
-		$block = $content = '';
-		next;
+		$block = $content = undef;
+	    } else {
+		#- now compute content (for finding the right key).
+		chomp;
+		/^$/ and $content = '';
+		defined $content and $content .= $_;
 	    }
-	    #- now compute content (for finding the right key).
-	    chomp;
-	    my $inside_content = /^$/ ... /^-----END PGP PUBLIC KEY BLOCK-----$/;
-	    $inside_content > 1 and $content .= $_;
 	}
     }
 
-- 
cgit v1.2.1