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

make_disc_trees.pl: fix misnamed $dist variable 

$dist would suggest distribution, an alternative name for suite or
codename (!), let's make it clear we mean component here.
This commit is contained in:
Cyril Brulebois 2023-01-21 16:40:56 +01:00
parent 8c497447f9
commit bbda95c283
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tools/make_disc_trees.pl
View File

@ -965,26 +965,26 @@ sub Packages_dir {
my $section = shift; my $section = shift;
my $in_backports = shift; my $in_backports = shift;
my ($pdir, $dist); my ($pdir, $component);
if ($file =~ /\/main\//) { if ($file =~ /\/main\//) {
$dist = "main"; $component = "main";
} elsif ($file =~ /\/contrib\//) { } elsif ($file =~ /\/contrib\//) {
$dist = "contrib"; $component = "contrib";
} elsif ($file =~ /\/non-free\//) { } elsif ($file =~ /\/non-free\//) {
$dist = "non-free"; $component = "non-free";
} elsif ($file =~ /\/non-free-firmware\//) { } elsif ($file =~ /\/non-free-firmware\//) {
$dist = "non-free-firmware"; $component = "non-free-firmware";
} else { } else {
$dist = "local"; $component = "local";
} }
$pdir = "$dir/dists/$codename/$dist"; $pdir = "$dir/dists/$codename/$component";
if ($in_backports) { if ($in_backports) {
$pdir = "$dir/dists/$codename-backports/$dist"; $pdir = "$dir/dists/$codename-backports/$component";
} }
if ($section and $section eq "debian-installer") { if ($section and $section eq "debian-installer") {
$pdir = "$dir/dists/$codename/$dist/debian-installer"; $pdir = "$dir/dists/$codename/$component/debian-installer";
# Don't attempt to put d-i components into backports, as d-i # Don't attempt to put d-i components into backports, as d-i
# won't look for them there. # won't look for them there.
} }
@ -1179,7 +1179,7 @@ sub add_firmware_stuff {
my $arch = shift; my $arch = shift;
my $in_backports = shift; my $in_backports = shift;
local $_ = shift; local $_ = shift;
my ($p, $file, $section, $dist, $dep11_dir); my ($p, $file, $section, $component, $dep11_dir);
my $blocks_added = 0; my $blocks_added = 0;
my @args = ("$basedir/tools/generate_firmware_patterns", my @args = ("$basedir/tools/generate_firmware_patterns",
"--output-dir", "$dir/firmware/dep11"); "--output-dir", "$dir/firmware/dep11");
@ -1191,20 +1191,20 @@ sub add_firmware_stuff {
my $base_file = basename($file); my $base_file = basename($file);
if ($file =~ /\/main\//) { if ($file =~ /\/main\//) {
$dist = "main"; $component = "main";
} elsif ($file =~ /\/contrib\//) { } elsif ($file =~ /\/contrib\//) {
$dist = "contrib"; $component = "contrib";
} elsif ($file =~ /\/non-free\//) { } elsif ($file =~ /\/non-free\//) {
$dist = "non-free"; $component = "non-free";
} elsif ($file =~ /\/non-free-firmware\//) { } elsif ($file =~ /\/non-free-firmware\//) {
$dist = "non-free-firmware"; $component = "non-free-firmware";
} else { } else {
$dist = "local"; $component = "local";
} }
$dep11_dir = "$mirror/dists/$codename/$dist/dep11"; $dep11_dir = "$mirror/dists/$codename/$component/dep11";
if ($in_backports) { if ($in_backports) {
$dep11_dir = "$mirror/dists/$codename-backports/$dist/dep11"; $dep11_dir = "$mirror/dists/$codename-backports/$component/dep11";
} }
if (! -d "$dir/firmware") { if (! -d "$dir/firmware") {