From: Michael Vogt <mvo@debian.org>
Date: Wed, 18 Jun 2014 09:21:35 +0000 (+0200)
Subject: Merge remote-tracking branch 'donkult/debian/sid' into debian/experimental
X-Git-Tag: 1.1.exp1~11
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/8d20b69d2fd7a8fec82bb559f0e39059bbaecf1b

Merge remote-tracking branch 'donkult/debian/sid' into debian/experimental

Conflicts:
	apt-private/private-install.cc
---

8d20b69d2fd7a8fec82bb559f0e39059bbaecf1b
diff --cc apt-private/private-install.cc
index 3b94237b4,e08cd8057..55893bda0
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@@ -19,8 -19,7 +19,8 @@@
  #include <apt-pkg/macros.h>
  #include <apt-pkg/packagemanager.h>
  #include <apt-pkg/pkgcache.h>
- #include <apt-pkg/sourcelist.h>
+ #include <apt-pkg/upgrade.h>
 +#include <apt-pkg/install-progress.h>
  
  #include <errno.h>
  #include <stdlib.h>
@@@ -700,10 -683,10 +709,10 @@@ bool DoInstall(CommandLine &CmdL
     if (Cache.OpenForInstall() == false || 
         Cache.CheckDeps(CmdL.FileSize() != 1) == false)
        return false;
 -
 +   
     std::map<unsigned short, APT::VersionSet> verset;
  
-    if(!DoCacheManipulationFromCommandLine(CmdL, Cache, verset))
+    if(!DoCacheManipulationFromCommandLine(CmdL, Cache, verset, 0))
        return false;
  
     /* Print out a list of packages that are going to be installed extra