diff options
| author | Michael Vogt <mvo@debian.org> | 2013-07-02 08:32:34 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-07-02 08:32:34 +0200 |
| commit | 8e4c3f0a42664b8c37cc2e0de285849fbf118e11 (patch) | |
| tree | 059b76fef1c1636a7e1ad16e5a4ce06304271718 /apt-pkg/pkgcachegen.cc | |
| parent | 25a4d2049fb79bc2c86cd45e977b4a071e5300ac (diff) | |
| parent | e3c62328abbd548bb0da42fdbad954b3ce4f7102 (diff) | |
Merge remote-tracking branch 'donkult/debian/sid' into debian/sid
Conflicts:
debian/changelog
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(); |