From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 22 Jul 2011 09:13:48 +0000 (+0200)
Subject: merged from the mvo branch
X-Git-Tag: 0.8.15.3~2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/ce2de59157d5ac584005c76f58b277adcaf8e1ab?hp=-c

merged from the mvo branch
---

ce2de59157d5ac584005c76f58b277adcaf8e1ab
diff --combined cmdline/apt-get.cc
index 3292ae745,3f818ffc3..99ee4f228
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -1697,7 -1697,7 +1697,7 @@@ bool DoAutomaticRemove(CacheFile &Cache
  
     // we could have removed a new dependency of a garbage package,
     // so check if a reverse depends is broken and if so install it again.
 -   if (tooMuch.empty() == false && Cache->BrokenCount() != 0)
 +   if (tooMuch.empty() == false && (Cache->BrokenCount() != 0 || Cache->PolicyBrokenCount() != 0))
     {
        bool Changed;
        do {
@@@ -1708,8 -1708,8 +1708,8 @@@
  	    for (pkgCache::DepIterator R = P.RevDependsList();
  		 R.end() == false; ++R)
  	    {
 -	       if (R->Type != pkgCache::Dep::Depends &&
 -		   R->Type != pkgCache::Dep::PreDepends)
 +	       if (R.IsNegative() == true ||
 +		   Cache->IsImportantDep(R) == false)
  		  continue;
  	       pkgCache::PkgIterator N = R.ParentPkg();
  	       if (N.end() == true || (N->CurrentVer == 0 && (*Cache)[N].Install() == false))
@@@ -2273,7 -2273,7 +2273,7 @@@ bool DoDownload(CommandLine &CmdL
  
     pkgAcquire Fetcher;
     AcqTextStatus Stat(ScreenWidth, _config->FindI("quiet",0));
-    if (_config->FindB("APT::Get::Print-URIs") == true)
+    if (_config->FindB("APT::Get::Print-URIs") == false)
        Fetcher.Setup(&Stat);
  
     pkgRecords Recs(Cache);
diff --combined debian/changelog
index 2e22e64d8,418f37f4d..c9d917407
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,33 -1,9 +1,35 @@@
 +apt (0.8.15.3) UNRELEASED; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/acquire-item.cc:
 +    - improve error message for a expired Release file
 +  * apt-pkg/algorithms.cc:
 +    - Hold back packages that would enter "policy-broken" state on upgrade
 +      when doing a "apt-get upgrade"
++  * cmdline/apt-get.cc:
++    - fix missing download progress in apt-get download
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/pkgcachegen.cc:
 +    - fallback to memory if file is not writeable even if access()
 +      told us the opposite before (e.g. in fakeroot 1.16) (Closes: #630591)
 +  * doc/sources.list.5.xml:
 +    - document available [options] for sources.list entries (Closes: 632441)
 +  * doc/apt.conf.5.xml:
 +    - document APT::Architectures list (Closes: #612102)
 +  * cmdline/apt-get.cc:
 +    - restore all important dependencies for garbage packages (LP: #806274)
 +  * apt-pkg/init.cc:
 +    - use CndSet in pkgInitConfig (Closes: #629617)
 +  * apt-pkg/depcache.cc:
 +    - change default of APT::AutoRemove::SuggestsImportant to true
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 15 Jul 2011 09:29:37 +0200
 +
  apt (0.8.15.2) unstable; urgency=high
  
    * fix from David Kalnischkies for the InRelease gpg verification 
      code (LP: #784473)
 -  * cmdline/apt-get.cc:
 -    - fix missing download progress in apt-get download
  
   -- Michael Vogt <mvo@debian.org>  Tue, 12 Jul 2011 11:54:47 +0200