josch/multistrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

* Fix logic in dump_config for missing packages lines. (Closes: #669206) * Check values of the keyring hash. (Closes: #669205)

Browse source 
git-svn-id: http://emdebian.org/svn/current@8323 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2012-04-18 20:26:28 +00:00
parent 7c68f05409
commit 1e2555c573
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
debian/changelog vendored
View file

@ -2,8 +2,11 @@ multistrap (2.1.18) experimental; urgency=low
* Reverse logic of ignorenativearch, thanks to * Reverse logic of ignorenativearch, thanks to
Andres Salomon <dilinger@queued.net>. (Closes: #669211) 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 multistrap (2.1.17) experimental; urgency=low

7
multistrap
View file

@ -376,7 +376,10 @@ foreach my $sect (sort keys %packages) {
} }
} }
chomp($str); chomp($str);
$str .= " " . join (' ', values %keyrings) . " "; foreach my $keystr (values %keyrings) {
next if (not defined $keystr);
$str .= " " . $keystr . " ";
}
chomp($str); chomp($str);
%uniq=(); %uniq=();
@s = split (/ /, $str); @s = split (/ /, $str);
@ -1216,7 +1219,7 @@ sub cascade {
if (ref ($keys{$section}{'packages'}) eq 'ARRAY') { if (ref ($keys{$section}{'packages'}) eq 'ARRAY') {
$packages{$section}=join(' ', @{$keys{$section}{'packages'}}) if (not exists $packages{$section}); $packages{$section}=join(' ', @{$keys{$section}{'packages'}}) if (not exists $packages{$section});
} else { } 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'} $suites{$section}=$keys{$section}{'suite'}