From: Michael Vogt <mvo@debian.org>
Date: Tue, 8 Oct 2013 17:59:04 +0000 (+0200)
Subject: Merge remote-tracking branch 'mvo/feature/upgrade-with-new' into debian/sid
X-Git-Tag: 0.9.12~11
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/649d3c5b7df830a67ad946921233da349c13a826

Merge remote-tracking branch 'mvo/feature/upgrade-with-new' into debian/sid
---

649d3c5b7df830a67ad946921233da349c13a826
diff --cc cmdline/apt-get.cc
index 630a9489b,3a41b8c1f..e5e22e166
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -1596,9 -1625,10 +1596,9 @@@ void SigWinch(int
  #endif
  }
  									/*}}}*/
 -
 -bool DoUpgrade(CommandLine &CmdL)
 +bool DoUpgrade(CommandLine &CmdL)					/*{{{*/
  {
-    if (_config->FindB("APT::Get::UpgradeAllowNew", false) == true)
+    if (_config->FindB("APT::Get::Upgrade-Allow-New", false) == true)
        return DoUpgradeWithAllowNewPackages(CmdL);
     else
        return DoUpgradeNoNewPackages(CmdL);