diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-25 21:54:52 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-25 21:54:52 +0100 |
| commit | 62dcafb391a940534d5fb3b804dc461b1187d706 (patch) | |
| tree | 83d28ffd4b0af97a0bba4f59c9a44e18091186b6 /apt-private/private-upgrade.cc | |
| parent | e093518c03b49a2def83d8b680be4490fed6e69c (diff) | |
| parent | 8c39c4b6e65036390b8ca4d74174192739a4139d (diff) | |
Merge branch 'debian/experimental-no-abi-break' into debian/sid
Diffstat (limited to 'apt-private/private-upgrade.cc')
| -rw-r--r-- | apt-private/private-upgrade.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/apt-private/private-upgrade.cc b/apt-private/private-upgrade.cc index e76b5d7fc..a97e6d25b 100644 --- a/apt-private/private-upgrade.cc +++ b/apt-private/private-upgrade.cc @@ -1,3 +1,4 @@ + // Includes /*{{{*/ #include <apt-pkg/algorithms.h> #include <apt-pkg/upgrade.h> @@ -39,6 +40,14 @@ bool DoDistUpgrade(CommandLine &CmdL) return UpgradeHelper(CmdL, 0); } /*}}}*/ +bool DoUpgrade(CommandLine &CmdL) /*{{{*/ +{ + if (_config->FindB("APT::Get::Upgrade-Allow-New", false) == true) + return DoUpgradeWithAllowNewPackages(CmdL); + else + return DoUpgradeNoNewPackages(CmdL); +} + /*}}}*/ // DoUpgradeNoNewPackages - Upgrade all packages /*{{{*/ // --------------------------------------------------------------------- /* Upgrade all packages without installing new packages or erasing old |