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

Turn $add_rec and $add_sug into globals 

There's no point in passing them as parameters everywhere.

This changes the behaviour in some places:

1/ When we process the non-explicitly included packages (for COMPLETE=1),
we used to never take Recommends/Suggests into account, now we do. But
the only thing that will be changed is the ordering with some
Recommended packages being included before their depending package.

2/ When we process the EXTRANONFREE image, this one was always including
Recommends and Suggests, and it's now respecting the setting too.
This commit is contained in:
Raphaël Hertzog 2022-08-04 19:31:36 +02:00
parent bbeab52f9a
commit c9489cd926
No known key found for this signature in database
GPG Key ID: 03881DABEBC29AB9
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tools/sort_deps
View File

@ -24,8 +24,8 @@ my $extranonfree = read_env('EXTRANONFREE', 0);
my $force_firmware = read_env('FORCE_FIRMWARE', 0); my $force_firmware = read_env('FORCE_FIRMWARE', 0);
my $local = read_env('LOCAL', 0); my $local = read_env('LOCAL', 0);
my $complete = read_env('COMPLETE', 0); my $complete = read_env('COMPLETE', 0);
my $norecommends = read_env('NORECOMMENDS', 1); my $add_rec = ! read_env('NORECOMMENDS', 1);
my $nosuggests = read_env('NOSUGGESTS', 1); my $add_sug = ! read_env('NOSUGGESTS', 1);
my $verbose = read_env('VERBOSE', 0); my $verbose = read_env('VERBOSE', 0);
my $max_pkg_size = read_env('MAX_PKG_SIZE', 9999999999999); my $max_pkg_size = read_env('MAX_PKG_SIZE', 9999999999999);
my $codename = $ENV{'CODENAME'}; my $codename = $ENV{'CODENAME'};
@ -87,10 +87,10 @@ msg(1, "Include non-free packages: ");
msg(1, yesno($nonfree)."\n"); msg(1, yesno($nonfree)."\n");
msg(1, "Force inclusion of firmware packages: "); msg(1, "Force inclusion of firmware packages: ");
msg(1, yesno($force_firmware)."\n"); msg(1, yesno($force_firmware)."\n");
msg(1, "Ignore Recommends: "); msg(1, "Include Recommends: ");
msg(1, yesno($norecommends)."\n"); msg(1, yesno($add_rec)."\n");
msg(1, "Ignore Suggests: "); msg(1, "Include Suggests: ");
msg(1, yesno($nosuggests)."\n"); msg(1, yesno($add_sug)."\n");
msg(1, "Maximum allowed package size: $max_pkg_size bytes\n"); msg(1, "Maximum allowed package size: $max_pkg_size bytes\n");
msg(1, "====================================================================== msg(1, "======================================================================
"); ");
@ -265,9 +265,9 @@ while (defined($_ = <STATUS>)) {
} }
next if $excluded{$p}; next if $excluded{$p};
if ($p =~ /\/$codename-backports$/) { if ($p =~ /\/$codename-backports$/) {
add_package($p, ! $norecommends, ! $nosuggests, 1); add_package($p, 1);
} else { } else {
add_package($p, ! $norecommends, ! $nosuggests, 0); add_package($p, 0);
} }
} }
close STATUS; close STATUS;
@ -297,9 +297,9 @@ while (defined($_=<LIST>)) {
add_to_output($_); add_to_output($_);
} else { } else {
if ($_ =~ /\/$codename-backports$/) { if ($_ =~ /\/$codename-backports$/) {
add_package($_, ! $norecommends, ! $nosuggests, 1); add_package($_, 1);
} else { } else {
add_package($_, ! $norecommends, ! $nosuggests, 0); add_package($_, 0);
} }
} }
} }
@ -322,9 +322,9 @@ if ($complete) {
msg(2, " Ignoring udeb $p ...\n"); msg(2, " Ignoring udeb $p ...\n");
} else { } else {
if ($p =~ /\/$codename-backports$/i) { if ($p =~ /\/$codename-backports$/i) {
add_package (lc $p, 0, 0, 1); add_package (lc $p, 1);
} else { } else {
add_package (lc $p, 0, 0, 0); add_package (lc $p, 0);
} }
} }
} }
@ -348,9 +348,9 @@ if ($extranonfree and (! $nonfree))
foreach $p (@toinclude) foreach $p (@toinclude)
{ {
if ($p =~ /\/$codename-backports$/i) { if ($p =~ /\/$codename-backports$/i) {
add_package (lc $p, 1, 1, 1); add_package (lc $p, 1);
} else { } else {
add_package (lc $p, 1, 1, 0); add_package (lc $p, 0);
} }
} }
@ -375,9 +375,9 @@ if ($extranonfree and (! $nonfree))
msg(2, " Ignoring udeb $p ...\n"); msg(2, " Ignoring udeb $p ...\n");
} else { } else {
if ($_ =~ /\/$codename-backports$/i) { if ($_ =~ /\/$codename-backports$/i) {
add_package (lc $_, 1, 1, 1); add_package (lc $_, 1);
} else { } else {
add_package (lc $_, 1, 1, 0); add_package (lc $_, 0);
} }
} }
} }
@ -396,9 +396,9 @@ if ($extranonfree and (! $nonfree))
msg(2, " Ignoring udeb $p ...\n"); msg(2, " Ignoring udeb $p ...\n");
} else { } else {
if ($p =~ /\/$codename-backports$/i) { if ($p =~ /\/$codename-backports$/i) {
add_package (lc $p, 0, 0, 1); add_package (lc $p, 1);
} else { } else {
add_package (lc $p, 0, 0, 0); add_package (lc $p, 0);
} }
} }
} }
@ -866,8 +866,6 @@ sub read_virtualdepends {
sub add_package { sub add_package {
my $p = shift; my $p = shift;
my $add_rec = shift; # Do we look for recommends
my $add_sug = shift; # Do we look for suggests
my $check_backports = shift; my $check_backports = shift;
my ($ok, $reasons); my ($ok, $reasons);