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

Fix multiarch/unstable support for packages listings.

Browse source 
git-svn-id: http://emdebian.org/svn/current@8329 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2012-04-21 13:48:46 +00:00
parent 76a5552663
commit a4bfe47610
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
multistrap (2.1.19) experimental; urgency=low
* Fix multiarch/unstable support for packages listings.
-- Neil Williams <codehelp@debian.org> Sat, 21 Apr 2012 14:45:49 +0100
multistrap (2.1.18) experimental; urgency=low multistrap (2.1.18) experimental; urgency=low
* Reverse logic of ignorenativearch, thanks to * Reverse logic of ignorenativearch, thanks to

8
multistrap
View file

@ -1138,8 +1138,8 @@ sub cascade {
if (defined $keys{$section}{'configscript'} and (not defined $configsh)); if (defined $keys{$section}{'configscript'} and (not defined $configsh));
$tgzname = lc($keys{$section}{'tarballname'}) $tgzname = lc($keys{$section}{'tarballname'})
if (defined $keys{$section}{'tarballname'} and (not defined $tgzname)); if (defined $keys{$section}{'tarballname'} and (not defined $tgzname));
chomp($tgzname); chomp($tgzname) if (defined $tgzname);
undef $tgzname if ($tgzname eq ''); undef $tgzname if (defined $tgzname and $tgzname eq '');
undef $configsh if ((defined $configsh) and (not -x $configsh)); undef $configsh if ((defined $configsh) and (not -x $configsh));
$setupsh = lc($keys{$section}{'setupscript'}) $setupsh = lc($keys{$section}{'setupscript'})
if (defined $keys{$section}{'setupscript'} and (not defined $setupsh)); if (defined $keys{$section}{'setupscript'} and (not defined $setupsh));
@ -1247,9 +1247,9 @@ sub cascade {
} }
} else { } else {
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'}});
} else { } else {
$packages{$section}=join(' ', $keys{$section}{'packages'}) if (exists $packages{$section}); $packages{$section}=join(' ', $keys{$section}{'packages'});
} }
} }
$suites{$section}=$keys{$section}{'suite'} $suites{$section}=$keys{$section}{'suite'}