Browse Source

* Fix some small logic errors in when the screen clear happens.

* Don't let -ris parameters interfere with running aptitude w/o
    --visual-preview if manual install is selected. Closes: #295111
tags/2.23
Joey Hess 16 years ago
parent
commit
3452e3c30d
2 changed files with 19 additions and 8 deletions
  1. +8
    -0
      debian/changelog
  2. +11
    -8
      tasksel.pl

+ 8
- 0
debian/changelog View File

@@ -1,3 +1,11 @@
tasksel (2.23) UNRELEASED; urgency=low

* Fix some small logic errors in when the screen clear happens.
* Don't let -ris parameters interfere with running aptitude w/o
--visual-preview if manual install is selected. Closes: #295111

-- Joey Hess <joeyh@debian.org> Tue, 15 Feb 2005 13:04:35 -0500

tasksel (2.22) unstable; urgency=low

* Removed manpages-zh from Key in chinese-[ts], since it has been removed


+ 11
- 8
tasksel.pl View File

@@ -396,8 +396,10 @@ sub main {
}
# The interactive bit.
my $interactive=0;
my @list = order_for_display(grep { $_->{_display} == 1 } @tasks);
if (@list && ! $options{"no-ui"} && ! $options{install} && ! $options{remove}) {
$interactive=1;
if (! $options{"new-install"}) {
# Find tasks that are already installed.
map { $_->{_installed} = task_installed($_) } @list;
@@ -444,10 +446,6 @@ sub main {
push @aptitude_remove, task_packages($task, 0);
}
}
# Clear screen before running aptitude.
if ((@aptitude_remove || @aptitude_install) && ! $options{test}) {
system("clear");
}
}

# Mark dependnent packages for install if their dependencies are met.
@@ -463,7 +461,13 @@ sub main {
}

# Add tasks to install.
push @aptitude_install, map { task_packages($_, 1) } grep { $_->{_install} } @tasks;
my @to_install=map { task_packages($_, 1) } grep { $_->{_install} } @tasks;
push @aptitude_install, @to_install;
# Clear screen before running aptitude.
if ($interactive && (@aptitude_remove || @aptitude_install) && ! $options{test}) {
system("clear");
}

# Remove any packages we were asked to.
if (@aptitude_remove) {
@@ -481,9 +485,8 @@ sub main {
# And finally, act on selected tasks.
if (@aptitude_install) {
# If aptitude is just being run with no tasks preselected
# to install, remove the --visual-preview parameter and
# just go to regular aptitude.
if (@aptitude_install == 1 && $aptitude_install[0] eq "--visual-preview") {
# to install, run aptitude w/o the --visual-preview parameter.
if (! @to_install) {
if ($options{test}) {
print "aptitude\n";
}


Loading…
Cancel
Save