diff options
| author | Michael Vogt <mvo@debian.org> | 2013-10-22 21:24:13 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-10-22 21:24:13 +0200 |
| commit | 4c9234d668bc1a250fd1af4c5d90497a08be67fd (patch) | |
| tree | 6f7851c01a98a98013625af3de28cceeab3e2db9 /cmdline | |
| parent | c08cf1dc784a98a253296a51433f6de7d16d3125 (diff) | |
| parent | 3f506f684c6199a9a2bc68365732a9c00dc551c1 (diff) | |
Merge remote-tracking branch 'mvo/feature/upgrade-api' into debian/sid
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-get.cc | 27 | ||||
| -rw-r--r-- | cmdline/apt-internal-solver.cc | 1 |
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> |