summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-10-22 22:05:15 +0200
committerMichael Vogt <mvo@debian.org>2013-10-22 22:06:24 +0200
commit51355387e5a5d4d7275a34b1c22f0ef5a76172d5 (patch)
treee40c80a0d5268eb42cf71461e5ef9494658e1b7d /cmdline
parentb4017ba767e15dc06c73915efaf36409ee099bf2 (diff)
parent4b9969da40ff1dff2f5787feff5103c873c57f7f (diff)
Merge remote-tracking branch 'upstream/debian/sid' into feature/install-progress-refactor
Conflicts: apt-pkg/deb/dpkgpm.cc apt-pkg/makefile
Diffstat (limited to 'cmdline')
-rw-r--r--cmdline/apt-get.cc27
-rw-r--r--cmdline/apt-internal-solver.cc1
2 files changed, 2 insertions, 26 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index e5e22e166..15373b050 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -49,6 +49,7 @@
#include <apt-pkg/pkgsystem.h>
#include <apt-pkg/pkgrecords.h>
#include <apt-pkg/indexfile.h>
+#include <apt-pkg/upgrade.h>
#include <apt-private/private-download.h>
#include <apt-private/private-install.h>
@@ -343,32 +344,6 @@ bool DoMarkAuto(CommandLine &CmdL)
return false;
}
/*}}}*/
-// DoDistUpgrade - Automatic smart upgrader /*{{{*/
-// ---------------------------------------------------------------------
-/* Intelligent upgrader that will install and remove packages at will */
-bool DoDistUpgrade(CommandLine &CmdL)
-{
- CacheFile Cache;
- if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
- return false;
-
- c0out << _("Calculating upgrade... ") << flush;
- if (pkgDistUpgrade(*Cache) == false)
- {
- c0out << _("Failed") << endl;
- ShowBroken(c1out,Cache,false);
- return false;
- }
-
- // parse additional cmdline pkg manipulation switches
- if(!DoCacheManipulationFromCommandLine(CmdL, Cache))
- return false;
-
- c0out << _("Done") << endl;
-
- return InstallPackages(Cache,true);
-}
- /*}}}*/
// DoDSelectUpgrade - Do an upgrade by following dselects selections /*{{{*/
// ---------------------------------------------------------------------
/* Follows dselect's selections */
diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index aef7636e9..53b38ea43 100644
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -19,6 +19,7 @@
#include <apt-pkg/algorithms.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/upgrade.h>
#include <unistd.h>
#include <cstdio>