Browse Source

show the conflicting distribution warning again

Sometimes you should really act upon your todos.
Especially if you have placed them directly in the code.

Closes: 841874
tags/debian/1.4_beta1
David Kalnischkies 5 years ago
parent
commit
d96c997ebe
2 changed files with 39 additions and 2 deletions
  1. +1
    -2
      apt-pkg/metaindex.cc
  2. +38
    -0
      test/integration/test-bug-841874-warning-for-mismatching-distribution

+ 1
- 2
apt-pkg/metaindex.cc View File

@@ -65,8 +65,7 @@ APT_PURE bool metaIndex::CheckDist(string const &MaybeDist) const
}
APT_PURE std::string metaIndex::GetExpectedDist() const
{
// TODO: Used to be an explicit value set in the constructor
return "";
return Dist;
}
/*}}}*/
APT_PURE metaIndex::checkSum *metaIndex::Lookup(string const &MetaKey) const /*{{{*/


+ 38
- 0
test/integration/test-bug-841874-warning-for-mismatching-distribution View File

@@ -0,0 +1,38 @@
#!/bin/sh
set -e

TESTDIR="$(readlink -f "$(dirname "$0")")"
. "$TESTDIR/framework"
setupenvironment
configarchitecture 'amd64'

insertpackage 'testing' 'foo' 'all' '1'

getcodenamefromsuite() { echo -n 'stretch'; }
setupaptarchive --no-update
APTARCHIVE="$(readlink -f './aptarchive')"
ln -s "${APTARCHIVE}/dists/testing" "${APTARCHIVE}/dists/stretch"
ln -s "${APTARCHIVE}/dists/testing" "${APTARCHIVE}/dists/zurg"

testfailure apt show foo
testsuccess apt update
testsuccess apt show foo

rm -rf rootdir/var/lib/apt/lists
sed -i -e 's#testing#stretch#g' rootdir/etc/apt/sources.list.d/*
testsuccess apt update
testsuccess apt show foo

rm -rf rootdir/var/lib/apt/lists
sed -i -e 's#stretch#zurg#g' rootdir/etc/apt/sources.list.d/*
testwarningmsg "W: Conflicting distribution: file:$APTARCHIVE zurg InRelease (expected zurg but got stretch)" apt update
testsuccess apt show foo

# check that 'foo/bar' is rewritten to 'foo' while we are at it
rm -rf rootdir/var/lib/apt/lists
sed -i -e 's#zurg#stretch/updates#g' rootdir/etc/apt/sources.list.d/*
testfailure apt update
testfailure apt show foo
ln -s "${APTARCHIVE}/dists/testing" "${APTARCHIVE}/dists/stretch/updates"
testsuccess apt update
testsuccess apt show foo

Loading…
Cancel
Save