summaryrefslogtreecommitdiff
path: root/test/integration/test-implicit-conflicts-real-not-virtual
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-03-06 17:53:30 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2012-03-06 17:53:30 +0100
commit6b60ece0fe85ccd70ac6dcb63be7a9f9a4f55c7a (patch)
tree4696bcdde0cd9e6ea7d6c2c390db635a0961b3ea /test/integration/test-implicit-conflicts-real-not-virtual
parentd426e829eba77281d59a0e6ddef287b96052d531 (diff)
parentb7a6594d1e5ed199a7a472b78b33e070375d6f92 (diff)
* merged from the debian-sid branch, most notably:
- Correct fi translation for hash sum mismatches (LP: #420403) - remove 'old' InRelease file if we can't get a new one before proceeding with Release.gpg to avoid the false impression of a still trusted repository by a (still present) old InRelease file. Thanks to Simon Ruderich for reporting this issue! (CVE-2012-0214) * apt-pkg/acquire-item.cc: - remove 'old' InRelease file if we can't get a new one before proceeding with Release.gpg to avoid the false impression of a still trusted repository by a (still present) old InRelease file. Thanks to Simon Ruderich for reporting this issue! (CVE-2012-0214) * French: replace "étiquetage" by "épinglage" for "pinning"
Diffstat (limited to 'test/integration/test-implicit-conflicts-real-not-virtual')
0 files changed, 0 insertions, 0 deletions