diff options
| author | Michael Vogt <mvo@debian.org> | 2013-11-23 09:13:30 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-11-23 09:13:30 +0100 |
| commit | 7d2428e03c1fdae79488b9ecd53cc5257b2a0c13 (patch) | |
| tree | 81209b60212c997452fd74cf184b8ca5445e8bc0 /cmdline | |
| parent | f62f17b489405432a3125e51471d8a00e78c5170 (diff) | |
| parent | 61f954bff040809e7ab57b3adec2fe95339ffb94 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
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 290dcb011..b288f1360 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> |