Browse Source

Use apt-get

tags/3.10
Bastian Blank 9 years ago
parent
commit
e147e11973
3 changed files with 14 additions and 13 deletions
  1. +4
    -0
      debian/changelog
  2. +1
    -1
      debian/control
  3. +9
    -12
      tasksel.pl

+ 4
- 0
debian/changelog View File

@@ -47,6 +47,10 @@ tasksel (3.10) UNRELEASED; urgency=low
* Remove manual task.
* Remove unused support for Packages: task-fields.
* Completely remove support for aptitude task syntax.
* Use apt-get.
- Force installation of recommends even if turned off.
- Force auto-removal of packages.
- Don't longer remove packages. (closes: #579522)

-- Christian Perrier <bubulle@debian.org> Sun, 25 Mar 2012 14:52:49 +0200



+ 1
- 1
debian/control View File

@@ -13,7 +13,7 @@ Section: admin
Priority: important
Architecture: all
Pre-Depends: debconf (>= 1.5.34) | cdebconf (>= 0.106)
Depends: ${misc:Depends}, ${perl:Depends}, liblocale-gettext-perl, aptitude (>= 0.2.15-1), tasksel-data
Depends: ${misc:Depends}, ${perl:Depends}, liblocale-gettext-perl, apt, tasksel-data
Conflicts: debconf (<< 1.4.27), base-config (<< 2.32)
Description: Tool for selecting tasks for installation on Debian systems
This package provides 'tasksel', a simple interface for users who


+ 9
- 12
tasksel.pl View File

@@ -579,29 +579,26 @@ sub main {

my @cmd;
if (-x "/usr/bin/debconf-apt-progress") {
@aptitude="debconf-apt-progress";
push @aptitude, split(' ', $options{'debconf-apt-progress'})
@cmd = "debconf-apt-progress";
push @cmd, split(' ', $options{'debconf-apt-progress'})
if exists $options{'debconf-apt-progress'};
push @aptitude, qw{-- aptitude -q};
push @cmd, "--";
}
else {
@aptitude="aptitude";
}
push @cmd, qw{apt-get -q -y -o APT::Install-Recommends=true -o APT::Get::AutomaticRemove=true install};

# And finally, act on selected tasks.
if (@tasks_install || @tasks_remove) {
my @args;
foreach my $task (@tasks_remove) {
push @args, map { "$_-" } task_packages($task);
push @cmd, map { "$_-" } task_packages($task);
task_script($task->{task}, "prerm");
}
foreach my $task (@tasks_install) {
push @args, task_packages($task);
push @cmd, task_packages($task);
task_script($task->{task}, "preinst");
}
my $ret=run(@aptitude, "-y", "install", @args);
my $ret=run(@cmd);
if ($ret != 0) {
error gettext("aptitude failed")." ($ret)";
error gettext("apt-get failed")." ($ret)";
}
foreach my $task (@tasks_remove) {
task_script($task->{task}, "postrm");


Loading…
Cancel
Save