diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-06-09 01:22:45 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-06-09 01:22:45 +0200 |
| commit | 5a68ea79e4828bb5615b1d490fe811c18d04a8e1 (patch) | |
| tree | fd78ffc3685a53dddf6854af34d08c9314bebbbd /cmdline | |
| parent | 74eb9ea2c4b00538e3358bb67bf19e74047d340d (diff) | |
* cmdline/apt-get.cc:
- revert task-install feature
- show auto-removal information
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-get.cc | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index e4632cc6c..e9b619787 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1596,6 +1596,18 @@ bool DoInstall(CommandLine &CmdL) bool Remove = DefRemove; char *VerTag = 0; bool VerIsRel = false; + + // this is a task! + if (Length >= 1 && S[Length - 1] == '^') + { + S[--Length] = 0; + // tasks must always be confirmed + ExpectedInst += 1000; + // see if we can install it + TryInstallTask(Cache, Fix, BrokenFix, ExpectedInst, S); + continue; + } + while (Cache->FindPkg(S).end() == true) { // Handle an optional end tag indicating what to do @@ -1744,10 +1756,8 @@ bool DoInstall(CommandLine &CmdL) return _error->Error(_("Broken packages")); } } - if (_config->FindB("APT::Get::AutomaticRemove")) { - if (!DoAutomaticRemove(Cache)) - return false; - } + if (!DoAutomaticRemove(Cache)) + return false; /* Print out a list of packages that are going to be installed extra to what the user asked */ |