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/deb/deblistparser.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/deb/deblistparser.cc')
-rw-r--r-- | apt-pkg/deb/deblistparser.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index db86bd698..28857176b 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -219,8 +219,12 @@ MD5SumValue debListParser::Description_md5() string const value = Section.FindS("Description-md5"); if (value.empty() == true) { + std::string const desc = Description() + "\n"; + if (desc == "\n") + return MD5SumValue(); + MD5Summation md5; - md5.Add((Description() + "\n").c_str()); + md5.Add(desc.c_str()); return md5.Result(); } else if (likely(value.size() == 32)) |