Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve the sort_deps fix for too-large packages 

Make sure that the package we're told about exists before we look for
its size - a number of the dependencies and recommends may not exist
and this will cause errors for us.

Also list the configured max_pkg_size at the top of the script, to
help with debugging later.
This commit is contained in:
Steve McIntyre 2015-07-23 18:39:43 +01:00
parent 87aff198e3
commit bde884deb4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/sort_deps
View File

@ -83,6 +83,7 @@ msg(1, "Ignore Recommends: ");
msg(1, yesno($norecommends)."\n");
msg(1, "Ignore Suggests: ");
msg(1, yesno($nosuggests)."\n");
msg(1, "Maximum allowed package size: $max_pkg_size bytes\n");
msg(1, "======================================================================
");
@ -871,9 +872,10 @@ sub add_missing {
# will do.
foreach my $pkg (@{$thisdep}) {
my %t = %$pkg;
my $pkgname = $t{"Package"};
my $pkgname = lc $t{"Package"};
if ($packages{$pkgname}{"Size"} > $max_pkg_size) {
if (exists $packages{$pkgname} &&
($packages{$pkgname}{"Size"} > $max_pkg_size)) {
msg(2, " $pkgname is too big, mark it as excluded\n");
$excluded{$pkgname} = 'toobig';
}