From 1e2555c573a24f9f0d64af78b107a1e00d2a4a5e Mon Sep 17 00:00:00 2001
From: codehelp <codehelp@debian.org>
Date: Wed, 18 Apr 2012 20:26:28 +0000
Subject: [PATCH] * Fix logic in dump_config for missing packages lines.
 (Closes: #669206) * Check values of the keyring hash. (Closes: #669205)

git-svn-id: http://emdebian.org/svn/current@8323 563faec7-e20c-0410-992a-a66f704d0ccd
---
 debian/changelog | 5 ++++-
 multistrap       | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 47dd65a..37402fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ multistrap (2.1.18) experimental; urgency=low
 
   * Reverse logic of ignorenativearch, thanks to 
     Andres Salomon <dilinger@queued.net>. (Closes: #669211)
+  * Fix logic in dump_config for missing packages lines.
+    (Closes: #669206)
+  * Check values of the keyring hash. (Closes: #669205)
 
- -- Neil Williams <codehelp@debian.org>  Wed, 18 Apr 2012 21:15:51 +0100
+ -- Neil Williams <codehelp@debian.org>  Wed, 18 Apr 2012 21:25:47 +0100
 
 multistrap (2.1.17) experimental; urgency=low
 
diff --git a/multistrap b/multistrap
index 6454b4d..0759bb6 100755
--- a/multistrap
+++ b/multistrap
@@ -376,7 +376,10 @@ foreach my $sect (sort keys %packages) {
 	}
 }
 chomp($str);
-$str .= " " . join (' ', values %keyrings) . " "; 
+foreach my $keystr (values %keyrings) {
+	next if (not defined $keystr);
+	$str .= " " . $keystr . " ";
+}
 chomp($str);
 %uniq=();
 @s = split (/ /, $str);
@@ -1216,7 +1219,7 @@ sub cascade {
 				if (ref ($keys{$section}{'packages'}) eq 'ARRAY') {
 					$packages{$section}=join(' ', @{$keys{$section}{'packages'}}) if (not exists $packages{$section});
 				} else {
-					$packages{$section}=join(' ', $keys{$section}{'packages'}) if (not exists $packages{$section});
+					$packages{$section}=join(' ', $keys{$section}{'packages'}) if (exists $packages{$section});
 				}
 			}
 			$suites{$section}=$keys{$section}{'suite'}