mark pkg(All|Dist)Upgrade as deprecated

The comment above their definition marks them already as such, so this
is only a formalisation of the deprecation and fixes the occurances we
have in our own code together with removing a magic number.

Git-Dch: Ignore

diff --git a/apt-pkg/upgrade.cc b/apt-pkg/upgrade.cc
index 20a38ecee189dfe42a9fd275f220027f15cad9c1..ca670bdf5804c2c1b3d223ff53192ae9a5305004 100644 (file)
--- a/apt-pkg/upgrade.cc
+++ b/apt-pkg/upgrade.cc
@@ -282,7 +282,12 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache)
 // APT::Upgrade::Upgrade - Upgrade using a specific strategy           /*{{{*/
 bool APT::Upgrade::Upgrade(pkgDepCache &Cache, int mode, OpProgress * const Progress)
 {
-   if (mode == 0)
+#if __GNUC__ >= 4
+       // the deprecated methods will become our privates, so that is fine
+       #pragma GCC diagnostic push
+       #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+   if (mode == ALLOW_EVERYTHING)
       return pkgDistUpgrade(Cache, Progress);
    else if ((mode & ~FORBID_REMOVE_PACKAGES) == 0)
       return pkgAllUpgradeWithNewPackages(Cache, Progress);
@@ -290,7 +295,9 @@ bool APT::Upgrade::Upgrade(pkgDepCache &Cache, int mode, OpProgress * const Prog
       return pkgAllUpgradeNoNewPackages(Cache, Progress);
    else
       _error->Error("pkgAllUpgrade called with unsupported mode %i", mode);
-
+#if __GNUC__ >= 4
+       #pragma GCC diagnostic pop
+#endif
    return false;
 }
                                                                        /*}}}*/

diff --git a/apt-pkg/upgrade.h b/apt-pkg/upgrade.h
index 894f0625e3f9ee8d5c6a35e2537e31f5414e4d9f..a3f693d86e4356978a070fd4b26469ca4a48c8f2 100644 (file)
--- a/apt-pkg/upgrade.h
+++ b/apt-pkg/upgrade.h
@@ -11,6 +11,7 @@
 #define PKGLIB_UPGRADE_H
 
 #include <stddef.h>
+#include <apt-pkg/macros.h>
 
 class pkgDepCache;
 class OpProgress;
@@ -19,6 +20,7 @@ namespace APT {
    namespace Upgrade {
       // FIXME: make this "enum class UpgradeMode {" once we enable c++11
       enum UpgradeMode {
+        ALLOW_EVERYTHING = 0,
          FORBID_REMOVE_PACKAGES = 1,
          FORBID_INSTALL_NEW_PACKAGES = 2
       };
@@ -27,8 +29,8 @@ namespace APT {
 }
 
 // please use APT::Upgrade::Upgrade() instead
-bool pkgDistUpgrade(pkgDepCache &Cache, OpProgress * const Progress = NULL);
-bool pkgAllUpgrade(pkgDepCache &Cache, OpProgress * const Progress = NULL);
+APT_DEPRECATED bool pkgDistUpgrade(pkgDepCache &Cache, OpProgress * const Progress = NULL);
+APT_DEPRECATED bool pkgAllUpgrade(pkgDepCache &Cache, OpProgress * const Progress = NULL);
 
 bool pkgMinimizeUpgrade(pkgDepCache &Cache);
 #endif

diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index 656b972339b124c39a9193dffa75e92bf3dc0e56..c172f5ee7d87645bfac646ae857de0a00ddfc977 100644 (file)
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@ -619,18 +619,14 @@ bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache,
       if (Fix != NULL)
       {
         // Call the scored problem resolver
-        bool resolver_fail = false;
         OpTextProgress Progress(*_config);
         bool const distUpgradeMode = strcmp(CmdL.FileList[0], "dist-upgrade") == 0 || strcmp(CmdL.FileList[0], "full-upgrade") == 0;
 
-        if (UpgradeMode == 0)
-        {
-           if (distUpgradeMode == true)
-              resolver_fail = APT::Upgrade::Upgrade(Cache, 0, &Progress);
-           else
-              resolver_fail = Fix->Resolve(true, &Progress);
-        } else
+        bool resolver_fail = false;
+        if (distUpgradeMode == true || UpgradeMode != APT::Upgrade::ALLOW_EVERYTHING)
            resolver_fail = APT::Upgrade::Upgrade(Cache, UpgradeMode, &Progress);
+        else
+           resolver_fail = Fix->Resolve(true, &Progress);
 
         if (resolver_fail == false && Cache->BrokenCount() == 0)
            return false;

diff --git a/apt-private/private-upgrade.cc b/apt-private/private-upgrade.cc
index 2a6dcc1533a29e5de82e8d85147ee698def05f9d..d13a6af49055a051e17e2e288c0a542ead575ac4 100644 (file)
--- a/apt-private/private-upgrade.cc
+++ b/apt-private/private-upgrade.cc
@@ -33,7 +33,7 @@ static bool UpgradeHelper(CommandLine &CmdL, int UpgradeFlags)
 /* Intelligent upgrader that will install and remove packages at will */
 bool DoDistUpgrade(CommandLine &CmdL)
 {
-   return UpgradeHelper(CmdL, 0);
+   return UpgradeHelper(CmdL, APT::Upgrade::ALLOW_EVERYTHING);
 }
                                                                        /*}}}*/
 bool DoUpgrade(CommandLine &CmdL)                                      /*{{{*/

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index d6cd94f7230814308e0909f5ac06a9f413211383..aed1beb4df6c6009fb51b2f02d182cc5c86ccce5 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -540,7 +540,7 @@ static bool DoDSelectUpgrade(CommandLine &)
    }
 
    // Now upgrade everything
-   if (pkgAllUpgrade(Cache) == false)
+   if (APT::Upgrade::Upgrade(Cache, APT::Upgrade::FORBID_REMOVE_PACKAGES | APT::Upgrade::FORBID_INSTALL_NEW_PACKAGES) == false)
    {
       ShowBroken(c1out,Cache,false);
       return _error->Error(_("Internal error, problem resolver broke stuff"));

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index c24a96cdfa2d87152287e8c2c7ef30d15befba70..0f2ec6283d04a268e2bcc69189b30e6fe3634a98 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -175,10 +175,10 @@ int main(int argc,const char *argv[])                                     /*{{{*/
 
        std::string failure;
        if (upgrade == true) {
-               if (pkgAllUpgrade(CacheFile) == false)
+               if (APT::Upgrade::Upgrade(CacheFile, APT::Upgrade::FORBID_REMOVE_PACKAGES | APT::Upgrade::FORBID_INSTALL_NEW_PACKAGES) == false)
                        failure = "ERR_UNSOLVABLE_UPGRADE";
        } else if (distUpgrade == true) {
-               if (pkgDistUpgrade(CacheFile) == false)
+               if (APT::Upgrade::Upgrade(CacheFile, APT::Upgrade::ALLOW_EVERYTHING) == false)
                        failure = "ERR_UNSOLVABLE_DIST_UPGRADE";
        } else if (Fix.Resolve() == false)
                failure = "ERR_UNSOLVABLE";