diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2012-02-18 19:48:04 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2012-02-18 19:48:04 +0100 |
| commit | f55602cb0cd7403206752479b2ec11c6367e2f6d (patch) | |
| tree | 063ce150ffbeb3265e70511560f97b0bd73a3e69 | |
| parent | 8e3900d0d7efc11d538b944ed1d9e4e3d5286ff6 (diff) | |
| download | apt-f55602cb0cd7403206752479b2ec11c6367e2f6d.tar.gz | |
use pdiff for Translation-* files if available (Closes: #657902)
Beware: pdiffs for Translation-* are only acquired if their
availability is advertised in the Release file.
| -rw-r--r-- | apt-pkg/acquire-item.cc | 7 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index ca40b0bd..4e6fb7ff 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1395,7 +1395,12 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) /*{{{*/ (*Target)->ShortDesc, ExpectedIndexHash); else if (transInRelease == false || MetaIndexParser->Exists((*Target)->MetaKey) == true) { - new pkgAcqIndexTrans(Owner, *Target, ExpectedIndexHash, MetaIndexParser); + if (_config->FindB("Acquire::PDiffs",true) == true && transInRelease == true && + MetaIndexParser->Exists(string((*Target)->MetaKey).append(".diff/Index")) == true) + new pkgAcqDiffIndex(Owner, (*Target)->URI, (*Target)->Description, + (*Target)->ShortDesc, ExpectedIndexHash); + else + new pkgAcqIndexTrans(Owner, *Target, ExpectedIndexHash, MetaIndexParser); } continue; } diff --git a/debian/changelog b/debian/changelog index 35a476d5..9e23311b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ apt (0.8.16~exp13) UNRELEASED; urgency=low * apt-pkg/acquire-item.cc: - drop support for i18n/Index file (introduced in 0.8.11) and use the Release file instead to get the Translations (Closes: #649314) + - use pdiff for Translation-* files if available (Closes: #657902) * ftparchive/writer.cc: - add 'Translation-*' to the default patterns @@ -54,7 +55,7 @@ apt (0.8.16~exp13) UNRELEASED; urgency=low * apt-pkg/contrib/fileutl.h: - fix compat with FileFd::OpenDescriptor() in ReadOnlyGzip mode - -- David Kalnischkies <kalnischkies@gmail.com> Sat, 18 Feb 2012 19:23:42 +0100 + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 18 Feb 2012 19:44:16 +0100 apt (0.8.16~exp12) experimental; urgency=low |