From: Michael Vogt <mvo@debian.org>
Date: Tue, 22 Oct 2013 19:24:13 +0000 (+0200)
Subject: Merge remote-tracking branch 'mvo/feature/upgrade-api' into debian/sid
X-Git-Tag: 0.9.13.exp1~11^2~2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/4c9234d668bc1a250fd1af4c5d90497a08be67fd?ds=inline;hp=-c

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

4c9234d668bc1a250fd1af4c5d90497a08be67fd
diff --combined cmdline/apt-get.cc
index e5e22e166,b150cf541..15373b050
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -49,6 -49,7 +49,7 @@@
  #include <apt-pkg/pkgsystem.h>
  #include <apt-pkg/pkgrecords.h>
  #include <apt-pkg/indexfile.h>
+ #include <apt-pkg/upgrade.h>
  
  #include <apt-private/private-download.h>
  #include <apt-private/private-install.h>
@@@ -343,32 -344,6 +344,6 @@@ bool DoMarkAuto(CommandLine &CmdL
     return false;
  }
  									/*}}}*/
- // DoDistUpgrade - Automatic smart upgrader				/*{{{*/
- // ---------------------------------------------------------------------
- /* Intelligent upgrader that will install and remove packages at will */
- bool DoDistUpgrade(CommandLine &CmdL)
- {
-    CacheFile Cache;
-    if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
-       return false;
- 
-    c0out << _("Calculating upgrade... ") << flush;
-    if (pkgDistUpgrade(*Cache) == false)
-    {
-       c0out << _("Failed") << endl;
-       ShowBroken(c1out,Cache,false);
-       return false;
-    }
-    
-    // parse additional cmdline pkg manipulation switches
-    if(!DoCacheManipulationFromCommandLine(CmdL, Cache))
-       return false;
- 
-    c0out << _("Done") << endl;
-    
-    return InstallPackages(Cache,true);
- }
- 									/*}}}*/
  // DoDSelectUpgrade - Do an upgrade by following dselects selections	/*{{{*/
  // ---------------------------------------------------------------------
  /* Follows dselect's selections */
@@@ -1598,7 -1573,7 +1573,7 @@@ void SigWinch(int
  									/*}}}*/
  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);