From: David Kalnischkies <david@kalnischkies.de>
Date: Fri, 1 Jul 2016 12:00:47 +0000 (+0200)
Subject: do not treat same-version local debs as downgrade
X-Git-Tag: 1.3_pre1~19
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/cb9ac09bd6a36e73c2dce1d529acde6e4d15e32d

do not treat same-version local debs as downgrade

As the volatile sources are parsed last they were sorted behind the
dpkg/status file and hence are treated as a downgrade, which isn't
really what you want to happen as from a user POV its an upgrade.
---

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index f9d8a8b4b..f0b5a982e 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -392,8 +392,21 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator
 	 if (Res > 0)
 	    break;
 	 // Versionstrings are equal - is hash also equal?
-	 if (Res == 0 && List.SameVersion(Hash, Ver) == true)
-	    break;
+	 if (Res == 0)
+	 {
+	    if (List.SameVersion(Hash, Ver) == true)
+	       break;
+	    // sort (volatile) sources above not-sources like the status file
+	    if ((CurrentFile->Flags & pkgCache::Flag::NotSource) == 0)
+	    {
+	       auto VF = Ver.FileList();
+	       for (; VF.end() == false; ++VF)
+		  if (VF.File().Flagged(pkgCache::Flag::NotSource) == false)
+		     break;
+	       if (VF.end() == true)
+		  break;
+	    }
+	 }
 	 // proceed with the next till we have either the right
 	 // or we found another version (which will be lower)
       }
diff --git a/test/integration/test-apt-get-install-deb b/test/integration/test-apt-get-install-deb
index 53675c080..3aacc301d 100755
--- a/test/integration/test-apt-get-install-deb
+++ b/test/integration/test-apt-get-install-deb
@@ -93,6 +93,7 @@ Version: 0
 Priority: extra
 Maintainer: No Body <no@example.org>
 Architecture: all
+Depends: foo:i386
 Description: test package" >> ./incoming/$PKG/DEBIAN/control
 	if [ -n "$3" ]; then
 		echo -n "$3" >> ./incoming/$PKG/DEBIAN/control
@@ -123,9 +124,12 @@ if [ "$(id -u)" = '0' ]; then
 	chmod 700 ./incoming
 	testsuccesswithnotice aptget install -y ./incoming/pkg-as-it-should-be_0_all.deb --reinstall
 	testfailure grep 'is already the newest version' rootdir/tmp/testsuccesswithnotice.output
+	chmod 711 ./incoming
 else
 	testsuccess aptget install -y ./incoming/pkg-as-it-should-be_0_all.deb --reinstall
 	testfailure grep 'is already the newest version' rootdir/tmp/testsuccess.output
 fi
 
-
+sed -i -e '/^Depends: foo/ d' rootdir/var/lib/dpkg/status
+testsuccess aptget install -y ./incoming/pkg-as-it-should-be_0_all.deb
+testfailure grep 'is already the newest version' rootdir/tmp/testsuccess.output