Browse Source

* Use debconf-apt-progress for removals too.

* Pass -y to aptitude remove.
tags/2.34
Joey Hess 15 years ago
parent
commit
2fa3deb711
2 changed files with 16 additions and 17 deletions
  1. +2
    -0
      debian/changelog
  2. +14
    -17
      tasksel.pl

+ 2
- 0
debian/changelog View File

@@ -11,6 +11,8 @@ tasksel (2.34) UNRELEASED; urgency=low
* Use debconf-apt-progress during installs (except if the user chooses
manual selection), to get a fancy progress bar and completly limit output
when run inside debconf to debconf protocol output.
* Use debconf-apt-progress for removals too.
* Pass -y to aptitude remove.

[ Translations of tasks ]
* French updated


+ 14
- 17
tasksel.pl View File

@@ -497,14 +497,26 @@ sub main {
&& ! $options{test} && ! $ENV{DEBIAN_HAS_FRONTEND}) {
system("clear");
}
my $aptitude;
if ($manual_selection) {
# Manaul selection and task installs, as best
# aptitude can do it currently. Disables use of
# debconf-apt-progress.
unshift @aptitude_install, "--visual-preview";
$aptitude="aptitude";
}
else {
$aptitude="debconf-apt-progress -- aptitude";
}

# Remove any packages we were asked to.
if (@aptitude_remove) {
if ($options{test}) {
print "aptitude remove ".join(" ", @aptitude_remove)."\n";
print "$aptitude -y remove ".join(" ", @aptitude_remove)."\n";
}
else {
my $ret=system("aptitude", "remove", @aptitude_remove) >> 8;
my $ret=system(split(' ', $aptitude), "-y", "remove", @aptitude_remove) >> 8;
if ($ret != 0) {
error gettext("aptitude failed")." ($ret)";
}
@@ -527,21 +539,6 @@ sub main {
}
}
else {
my $aptitude;
if ($manual_selection) {
# Manaul selection and task installs, as best
# aptitude can do it currently. Disables use of
# debconf-apt-progress.
unshift @aptitude_install, "--visual-preview";
$aptitude="aptitude";
}
elsif (-x "/usr/bin/debconf-apt-progress") {
$aptitude="debconf-apt-progress -- aptitude";
}
else {
$aptitude="aptitude";
}
if ($options{test}) {
print "$aptitude --without-recommends -y install ".join(" ", @aptitude_install)."\n";
}


Loading…
Cancel
Save