diff options
| author | Francois Pons <fpons@mandriva.com> | 2003-08-21 09:46:40 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2003-08-21 09:46:40 +0000 |
| commit | 26a4878d6c5b03be939dfe06177a83f83f4ff83e (patch) | |
| tree | 17cfa070d3e0926f348e21381c442c18e0e6efd1 | |
| parent | 2645892cec8b60eb32d23d22e71679ece63ea6ef (diff) | |
| download | drakx-26a4878d6c5b03be939dfe06177a83f83f4ff83e.tar drakx-26a4878d6c5b03be939dfe06177a83f83f4ff83e.tar.gz drakx-26a4878d6c5b03be939dfe06177a83f83f4ff83e.tar.bz2 drakx-26a4878d6c5b03be939dfe06177a83f83f4ff83e.tar.xz drakx-26a4878d6c5b03be939dfe06177a83f83f4ff83e.zip | |
really fixed bad content generated.
| -rw-r--r-- | perl-install/pkgs.pm | 12 |
1 files changed, 6 insertions, 6 deletions
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 .= $_; } } |