diff options
author | Michael Vogt <mvo@ubuntu.com> | 2013-07-02 16:53:45 +0200 |
---|---|---|
committer | Michael Vogt <mvo@ubuntu.com> | 2013-07-02 16:53:45 +0200 |
commit | 56363109dac51dffb6ec8491728e0bc934a15fa1 (patch) | |
tree | 90db7c6af4ea25028df6c2731a57b0724fc3c626 /apt-pkg/pkgcachegen.cc | |
parent | 3599bca5211077f5456a40adb5cec1bcbee8c3ae (diff) | |
parent | 4b8528bd5749f759e924534709a620da67cd40f8 (diff) |
merged debian/sid branch from git.debian.org
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(); |