Browse Source

* Remove deprecated pango-libthai from the thai-desktop task.

* Put in an ugly hack to support chained enhances.
tags/2.69
Joey Hess 14 years ago
parent
commit
a2d6dcf2b1
2 changed files with 36 additions and 19 deletions
  1. +5
    -2
      debian/changelog
  2. +31
    -17
      tasksel.pl

+ 5
- 2
debian/changelog View File

@@ -32,10 +32,13 @@ tasksel (2.69) UNRELEASED; urgency=low
formats. Closes: #414408

[ Christian Perrier ]
* Remove deprecated pango-libthai from the thai-desktop task.
* Remove deprecated pango-libthai from the thai-desktop task.
Closes: #433429

-- Christian Perrier <bubulle@debian.org> Tue, 17 Jul 2007 19:35:47 +0200
[ Joey Hess ]
* Put in an ugly hack to support chained enhances.

-- Joey Hess <joeyh@debian.org> Wed, 01 Aug 2007 17:16:09 -0400

tasksel (2.68) unstable; urgency=low



+ 31
- 17
tasksel.pl View File

@@ -506,27 +506,41 @@ sub main {
}
}

# Select enhancing tasks for install.
# If an enhancing task is already marked for
# install, probably by preseeding, mark the tasks
# it enhances for install.
foreach my $task (grep { $_->{_install} && exists $_->{enhances} &&
length $_->{enhances} } @tasks) {
# If an enhancing task is already marked for
# install, probably by preseeding, mark the tasks
# it enhances for install.
map { $_->{_install}=1 } list_to_tasks($task->{enhances}, @tasks);
}
foreach my $task (grep { ! $_->{_install} && exists $_->{enhances} &&
length $_->{enhances} } @tasks) {
my @deps=list_to_tasks($task->{enhances}, @tasks);
if (@deps) {
# Mark enhancing tasks for install if their
# dependencies are met and their test fields
# mark them for install.
$ENV{TESTING_ENHANCER}=1;
task_test($task, $options{"new-install"}, 0, 1);
delete $ENV{TESTING_ENHANCER};
foreach my $dep (@deps) {
if (! $dep->{_install}) {
$task->{_install} = 0;

# Select enhancing tasks for install.
# XXX FIXME ugly hack -- loop until enhances settle to handle
# chained enhances. This is sloow and could loop forever if
# there's a cycle.
my $enhances_needswork=1;
while ($enhances_needswork) {
$enhances_needswork=0;
foreach my $task (grep { ! $_->{_install} && exists $_->{enhances} &&
length $_->{enhances} } @tasks) {
my @deps=list_to_tasks($task->{enhances}, @tasks);
if (@deps) {
my $orig_state=$task->{_install};

# Mark enhancing tasks for install if their
# dependencies are met and their test fields
# mark them for install.
$ENV{TESTING_ENHANCER}=1;
task_test($task, $options{"new-install"}, 0, 1);
delete $ENV{TESTING_ENHANCER};
foreach my $dep (@deps) {
if (! $dep->{_install}) {
$task->{_install} = 0;
}
}

if ($task->{_install} != $orig_state) {
$enhances_needswork=1;
}
}
}


Loading…
Cancel
Save