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

Extend FORCE_SID_TASKSEL usage in update_tasks 

Also affect desktop choice algorithm
This commit is contained in:
Steve McIntyre 2014-09-26 22:41:39 +01:00
parent 65efdc6d3c
commit 6d7bcaf0bb
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -11,6 +11,8 @@ debian-cd (3.1.16) UNRELEASED; urgency=medium
add arm64. add arm64.
* Add Debian-mate and Debian-cinnamon top-level tasks for new CD desktop * Add Debian-mate and Debian-cinnamon top-level tasks for new CD desktop
options options
* Extend FORCE_SID_TASKSEL usage in update_tasks to also affect desktop
choice algorithm
[ Philipp Hahn ] [ Philipp Hahn ]
* Fix word-splitting regexp in generate_di_list. Closes: #758512. * Fix word-splitting regexp in generate_di_list. Closes: #758512.

22
tools/update_tasks
View File

@ -30,6 +30,16 @@ if (! defined($basedir)) {
my $tdir = "$bdir/update_tasks"; my $tdir = "$bdir/update_tasks";
system("mkdir -p $tdir"); system("mkdir -p $tdir");
# Default to using tasksel and tasks data from the same release we're
# using, but allow it to be overridden. For testing purposes - set up
# FORCE_SID_TASKSEL to force us to use sid's tasksel data even if
# we're using stable/testing.
my $tasks_codename = $codename;
if (defined($ENV{'FORCE_SID_TASKSEL'}) and $ENV{'FORCE_SID_TASKSEL'} eq '1') {
print "update_tasks: forcing use of sid tasksel data\n";
$tasks_codename = "sid";
}
# Look for the coreutils package (which should exist in all archs, and # Look for the coreutils package (which should exist in all archs, and
# is a non -all package) to determine a valid arch for the rest of # is a non -all package) to determine a valid arch for the rest of
# this script # this script
@ -46,7 +56,7 @@ my $default_desktop;
# Find the dependency information of the task-desktop deb to see what # Find the dependency information of the task-desktop deb to see what
# the default desktop should be # the default desktop should be
my $task_desktop_deb = `$basedir/tools/which_deb $mirror $codename task-desktop binary`; my $task_desktop_deb = `$basedir/tools/which_deb $mirror $tasks_codename task-desktop binary`;
open (TASKS, "dpkg --info $mirror/$task_desktop_deb |") or open (TASKS, "dpkg --info $mirror/$task_desktop_deb |") or
die "update_tasks: Can't run dpkg --info $mirror/$task_desktop_deb; $!\n"; die "update_tasks: Can't run dpkg --info $mirror/$task_desktop_deb; $!\n";
while (<TASKS>) { while (<TASKS>) {
@ -57,15 +67,7 @@ print "update_tasks: Using \"$default_desktop\" as the default desktop, as speci
# Extract the tasksel-data deb for our suite; we need to parse the # Extract the tasksel-data deb for our suite; we need to parse the
# data in it # data in it
my $tasksel_deb = `$basedir/tools/which_deb $mirror $codename tasksel-data binary`; my $tasksel_deb = `$basedir/tools/which_deb $mirror $tasks_codename tasksel-data binary`;
# For testing purposes - set up FORCE_SID_TASKSEL to force us to use
# sid's tasksel data even if we're using stable/testing.
if (defined($ENV{'FORCE_SID_TASKSEL'}) and $ENV{'FORCE_SID_TASKSEL'} eq '1') {
print "update_tasks: forcing use of the sid tasksel-data tasks\n";
$tasksel_deb = `$basedir/tools/which_deb $mirror sid tasksel-data binary`;
}
$tasksel_deb = "$mirror/$tasksel_deb"; $tasksel_deb = "$mirror/$tasksel_deb";
chomp $tasksel_deb; chomp $tasksel_deb;