From bde884deb44ba428b3584713a6ef66165f0674aa Mon Sep 17 00:00:00 2001 From: Steve McIntyre Date: Thu, 23 Jul 2015 18:39:43 +0100 Subject: [PATCH] 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. --- tools/sort_deps | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/sort_deps b/tools/sort_deps index e7aad974..33d298f5 100755 --- a/tools/sort_deps +++ b/tools/sort_deps @@ -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'; }