Merge remote-tracking branch 'mvo/debian/sid' into debian/experimental-no-abi-break

[apt.git] / apt-private / private-upgrade.cc

diff --git a/apt-private/private-upgrade.cc b/apt-private/private-upgrade.cc
index e76b5d7fc0efd6e29d255050db3db7108c51aa20..a97e6d25b3afdc02abeb684cc9cf4f35f5fa6f8d 100644 (file)
--- 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>
 // Includes                                                            /*{{{*/
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/upgrade.h>


@@ -39,6 +40,14 @@ bool DoDistUpgrade(CommandLine &CmdL)
    return UpgradeHelper(CmdL, 0);
 }
                                                                        /*}}}*/
    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
 // DoUpgradeNoNewPackages - Upgrade all packages                       /*{{{*/
 // ---------------------------------------------------------------------
 /* Upgrade all packages without installing new packages or erasing old