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

Revert "Implement recursive lookup of Recommends and Suggests" 

This reverts commit 8513b237af.

This change doesn't seem ready yet - running a weekly build failed
with massive memory usage.
This commit is contained in:
Steve McIntyre 2022-08-08 20:23:13 +01:00
parent 8c86a9b3ed
commit 3a13ddb48a
2 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -17,8 +17,6 @@ debian-cd (3.1.36) UNRELEASED; urgency=medium
* Add cryptsetup-initramfs to tools/generate_di+k_list as cryptsetup 2.4.0 * Add cryptsetup-initramfs to tools/generate_di+k_list as cryptsetup 2.4.0
dropped the recommends on the package and it's needed by d-i. dropped the recommends on the package and it's needed by d-i.
* Fix install_firmwares_initrd to not fail when the firmware is not found. * Fix install_firmwares_initrd to not fail when the firmware is not found.
* Implement recursive lookup of Recommends and Suggests in sort_deps.
Closes: #601203
[ Wolfgang Schweer ] [ Wolfgang Schweer ]
* data/bookworm: Use Debian Edu 12 installer logo and syslinux splash image * data/bookworm: Use Debian Edu 12 installer logo and syslinux splash image

28
tools/sort_deps
View File

@ -984,25 +984,12 @@ sub get_missing {
my @parents = (); my @parents = ();
my %t; my %t;
my $dep_text; my $dep_text;
my $found_missing = 0;
$t{"Package"} = $p; $t{"Package"} = $p;
$t{"CmpOp"} = ""; $t{"CmpOp"} = "";
$t{"Version"} = ""; $t{"Version"} = "";
if (add_missing (\@deps_list, $packages{$p}{"Depends"}, \%t, 0, \@parents, $check_backports)) { if (not add_missing (\@deps_list, $packages{$p}{"Depends"}, \%t, 0, \@parents, $check_backports)) {
$found_missing = 1;
}
if ($add_rec and add_missing (\@deps_list, $packages{$p}{"Recommends"}, \%t, 1, \@parents, $check_backports)) {
$found_missing = 1;
}
if ($add_sug and add_missing (\@deps_list, $packages{$p}{"Suggests"}, \%t, 1, \@parents, $check_backports)) {
$found_missing = 1;
}
if (not $found_missing) {
return (); return ();
} }
@ -1138,12 +1125,6 @@ sub add_missing {
push (@{$list}, $pkg); push (@{$list}, $pkg);
if (add_missing ($list, $packages{$pkgname}{"Depends"}, $pkg, $soft_depend, $parents, $check_backports)) { if (add_missing ($list, $packages{$pkgname}{"Depends"}, $pkg, $soft_depend, $parents, $check_backports)) {
$or_ok = 1; $or_ok = 1;
if ($add_rec) {
add_missing ($list, $packages{$pkgname}{"Recommends"}, $pkg, 1, $parents, $check_backports);
}
if ($add_sug) {
add_missing ($list, $packages{$pkgname}{"Suggests"}, $pkg, 1, $parents, $check_backports);
}
remove_entry($pkg, $list); remove_entry($pkg, $list);
push @{$list}, $pkg; push @{$list}, $pkg;
last; last;
@ -1200,13 +1181,6 @@ sub add_missing {
pop @{$list}; pop @{$list};
$ok = 0; $ok = 0;
} }
} else {
if ($add_rec) {
add_missing ($list, $packages{$t{"Package"}}{"Recommends"}, \%t, 1, $parents, $check_backports);
}
if ($add_sug) {
add_missing ($list, $packages{$t{"Package"}}{"Suggests"}, \%t, 1, $parents, $check_backports);
}
} }
remove_entry(\%t, $list); remove_entry(\%t, $list);
push @{$list}, \%t; push @{$list}, \%t;