From e90f0acdd2f460d57a92ca6e222bf69e84df9935 Mon Sep 17 00:00:00 2001 From: Steve McIntyre Date: Tue, 21 Jul 2015 23:33:30 +0100 Subject: [PATCH] Backport sort_deps fix from master * tools/sort_deps: Improve handling of too-large packages. Previously, the code would only check sizes for packages explicitly listed but packages brought in due to dependency resolution would not be checked. Now fixed. --- debian/changelog | 1 + tools/sort_deps | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9df70101..4eeb26db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium + Fix handlinkg of LOGOPNG when we've got "doppelganer" initramfs files + Add support for debian-edu builds + + tools/sort_deps: Improved handling of too-large packages -- Steve McIntyre <93sam@debian.org> Mon, 20 Apr 2015 12:36:57 +0100 diff --git a/tools/sort_deps b/tools/sort_deps index c17ee398..e7aad974 100755 --- a/tools/sort_deps +++ b/tools/sort_deps @@ -873,6 +873,11 @@ sub add_missing { my %t = %$pkg; my $pkgname = $t{"Package"}; + if ($packages{$pkgname}{"Size"} > $max_pkg_size) { + msg(2, " $pkgname is too big, mark it as excluded\n"); + $excluded{$pkgname} = 'toobig'; + } + # Already installed? if (dep_satisfied($pkg)) { msg(3, " OR relationship already installed: " . dump_depend($pkg) . "\n");