diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-24 23:05:25 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-24 23:05:25 +0100 |
| commit | 48e48cbdc47a0b29ac1b9d2b7d4eef61be73d06d (patch) | |
| tree | 6c464b7197ba374f9952aeb1571e15a1453183f2 /apt-private/private-upgrade.cc | |
| parent | b18dd45f2c71fbdf5c0eef113e9e8e01f84b70a7 (diff) | |
| parent | 34f7c486b10559997849c15c6b51577ec3f96bc1 (diff) | |
Merge remote-tracking branch 'mvo/debian/sid' into debian/experimental-no-abi-break
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 |