Merge branch 'fix-undef-var1' into 'master'

Fix unset variable default_desktop with some mirrors

See merge request images-team/debian-cd!24
This commit is contained in:
bauen1 2024-10-26 03:03:22 +00:00
commit 358d3dff7f
2 changed files with 3 additions and 1 deletions

2
debian/changelog vendored
View File

@ -194,6 +194,8 @@ debian-cd (3.1.36) unstable; urgency=medium
[ Jonathan Hettwer ]
* Avoid embedding timestamps into gzipped Packages and Translations files.
* Pass --invariant and -i deb00001 to mkfs.msdos
* Remove complaint about unset variable default_desktop when using a mirror
without task packages.
[ Samuel Thibault ]
* On firmware images, include the sound firmwares in the espeakup-enabled

View File

@ -52,7 +52,7 @@ if ($coreutils_deb =~ m/_([[:alnum:]-]+)\.deb/) {
# used in a few places to decide what happens when doing "generic"
# discs.
my $default_desktop;
my $default_desktop = "";
# Find the dependency information of the task-desktop deb to see what
# the default desktop should be