diff options
| author | Michael Vogt <mvo@debian.org> | 2013-07-24 22:06:18 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-07-24 22:06:18 +0200 |
| commit | f39daeb1f66b8910f91274055bf07c3d008cdc50 (patch) | |
| tree | 9283950ebf8a3089b8b16b1d09c3aec8ecc5eb07 /apt-pkg/pkgcachegen.cc | |
| parent | 267275c59cc35704789a228c6e9b1464c4cabd74 (diff) | |
| parent | c7a629dd114c41a1244744e2f5085df2f505dc90 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid'
Diffstat (limited to 'apt-pkg/pkgcachegen.cc')
| -rw-r--r-- | apt-pkg/pkgcachegen.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 3f10b6c40..7ce7aba7b 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -296,6 +296,8 @@ bool pkgCacheGenerator::MergeListPackage(ListParser &List, pkgCache::PkgIterator // Find the right version to write the description MD5SumValue CurMd5 = List.Description_md5(); + if (CurMd5.Value().empty() == true || List.Description().empty() == true) + return true; std::string CurLang = List.DescriptionLanguage(); for (Ver = Pkg.VersionList(); Ver.end() == false; ++Ver) @@ -480,7 +482,7 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator /* Record the Description (it is not translated) */ MD5SumValue CurMd5 = List.Description_md5(); - if (CurMd5.Value().empty() == true) + if (CurMd5.Value().empty() == true || List.Description().empty() == true) return true; std::string CurLang = List.DescriptionLanguage(); |