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

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.
This commit is contained in:
Steve McIntyre 2015-07-21 23:33:30 +01:00
parent 6c486dc82d
commit e90f0acdd2
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -7,6 +7,7 @@ debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium
+ Fix handlinkg of LOGOPNG when we've got "doppelganer" initramfs + Fix handlinkg of LOGOPNG when we've got "doppelganer" initramfs
files files
+ Add support for debian-edu builds + 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 -- Steve McIntyre <93sam@debian.org> Mon, 20 Apr 2015 12:36:57 +0100

5
tools/sort_deps
View File

@ -873,6 +873,11 @@ sub add_missing {
my %t = %$pkg; my %t = %$pkg;
my $pkgname = $t{"Package"}; 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? # Already installed?
if (dep_satisfied($pkg)) { if (dep_satisfied($pkg)) {
msg(3, " OR relationship already installed: " . dump_depend($pkg) . "\n"); msg(3, " OR relationship already installed: " . dump_depend($pkg) . "\n");