diff options
| -rw-r--r-- | apt-private/private-source.cc | 12 | ||||
| -rwxr-xr-x | test/integration/test-apt-get-source | 20 |
2 files changed, 25 insertions, 7 deletions
diff --git a/apt-private/private-source.cc b/apt-private/private-source.cc index da7330970..21c69e19c 100644 --- a/apt-private/private-source.cc +++ b/apt-private/private-source.cc @@ -288,6 +288,7 @@ static pkgSrcRecords::Parser *FindSrc(const char *Name, while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0) { const std::string Ver = Parse->Version(); + bool CorrectRelTag = false; // See if we need to look for a specific release tag if (RelTag != "" && UserRequestedVerTag == "") @@ -297,13 +298,10 @@ static pkgSrcRecords::Parser *FindSrc(const char *Name, { if ((Rls->Archive != 0 && RelTag == Rls.Archive()) || (Rls->Codename != 0 && RelTag == Rls.Codename())) - { - Last = Parse; - Offset = Parse->Offset(); - Version = Ver; - } + CorrectRelTag = true; } - } + } else + CorrectRelTag = true; // Ignore all versions which doesn't fit if (VerTag.empty() == false && @@ -311,7 +309,7 @@ static pkgSrcRecords::Parser *FindSrc(const char *Name, continue; // Newer version or an exact match? Save the hit - if (Last == 0 || Cache->VS().CmpVersion(Version,Ver) < 0) { + if (CorrectRelTag && (Last == 0 || Cache->VS().CmpVersion(Version,Ver) < 0)) { Last = Parse; Offset = Parse->Offset(); Version = Ver; diff --git a/test/integration/test-apt-get-source b/test/integration/test-apt-get-source index 763318743..48a70277c 100755 --- a/test/integration/test-apt-get-source +++ b/test/integration/test-apt-get-source @@ -27,6 +27,14 @@ insertsource 'stable' 'foo' 'all' '1.0' insertsource 'wheezy' 'foo' 'all' '0.0.1' insertsource 'wheezy' 'foo' 'all' '0.1' +# the order of these versions is choosen to ensure that +# * apt will pick the one in the correct release, despite a higher version coming later and +# * apt will pick the highest version in a release, despite a lower version coming later. +# (bts #746412) +insertsource 'stable' 'baz' 'all' '1.0' +insertsource 'unstable' 'baz' 'all' '2.0' +insertsource 'unstable' 'baz' 'all' '1.5' + insertsource 'stable' 'bar' 'any' '1.1' 'Vcs-Browser: https://anonscm.debian.org/cgit/bar/bar.git Vcs-Git: git://anonscm.debian.org/bar/bar.git -b debian/experimental' @@ -43,6 +51,12 @@ DOWNLOAD1="Need to get 0 B/25 B of source archives. DOWNLOAD2="Need to get 0 B/25 B of source archives. 'file://${APTARCHIVE}/foo_2.0.dsc' foo_2.0.dsc 11 SHA256:0fcb803ffbeef26db884625aaf06e75f3eda5c994634980e7c20fd37ed1fc104 'file://${APTARCHIVE}/foo_2.0.tar.gz' foo_2.0.tar.gz 14 SHA256:ca9b0b828ca22372502af2b80f61f0bd9063910ece9fc34eeaf9d9e31aa8195a" +DOWNLOAD3="Need to get 0 B/25 B of source archives. +'file://${APTARCHIVE}/baz_1.0.dsc' baz_1.0.dsc 11 SHA256:322245f56092b466801dda62d79c8687bba9724af6d16d450d655d29e41d3d7b +'file://${APTARCHIVE}/baz_1.0.tar.gz' baz_1.0.tar.gz 14 SHA256:0870bc73164ff5ba1f52153fdcb48e140137f9c7c122d57592cea136a57f73c0" +DOWNLOAD4="Need to get 0 B/25 B of source archives. +'file://${APTARCHIVE}/baz_2.0.dsc' baz_2.0.dsc 11 SHA256:47d062d29070b3f592d1c8aed8c1e7913804bbb67ca1d64877c8219dac5e0420 +'file://${APTARCHIVE}/baz_2.0.tar.gz' baz_2.0.tar.gz 14 SHA256:11c1b202c94a64ab6433d9f0ed5515fce1dc7b20e6bcf51cec9ef8b9455f5a41" testsuccessequal "$HEADER $DOWNLOAD2" aptget source -q --print-uris foo testsuccessequal "$HEADER @@ -61,6 +75,9 @@ $DOWNLOAD1" aptget source -q --print-uris foo -t stable testsuccessequal "$HEADER Selected version '2.0' (unstable) for foo $DOWNLOAD2" aptget source -q --print-uris foo -t unstable +testsuccessequal "$HEADER +Selected version '1.0' (stable) for baz +$DOWNLOAD3" aptget source -q --print-uris baz -t stable # select by release: codename testsuccessequal "$HEADER @@ -69,6 +86,9 @@ $DOWNLOAD2" aptget source -q --print-uris foo/sid testsuccessequal "$HEADER Selected version '2.0' (sid) for foo $DOWNLOAD2" aptget source -q --print-uris foo -t sid +testsuccessequal "$HEADER +Selected version '2.0' (sid) for baz +$DOWNLOAD4" aptget source -q --print-uris baz -t sid # select by version testsuccessequal "$HEADER |