diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-07-28 11:58:55 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-07-28 11:58:55 +0200 |
| commit | 75bda61948950a88fdd41a5362920cc46c9669e2 (patch) | |
| tree | 8e8d278d44be6d31d0ab4cd086ccedd08bf9aa15 | |
| parent | 14b4780d0da30493b949bf65587f4e8a71db561d (diff) | |
[ABI break] merged patch from Jonathan Thomas to have a new
RecordField() function in the pkgRecorder parser. Many thanks
Thomas
| -rw-r--r-- | apt-pkg/deb/debrecords.cc | 9 | ||||
| -rw-r--r-- | apt-pkg/deb/debrecords.h | 3 | ||||
| -rw-r--r-- | apt-pkg/pkgrecords.h | 5 | ||||
| -rw-r--r-- | debian/changelog | 3 |
4 files changed, 19 insertions, 1 deletions
diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc index 1ca9ae1d2..f323c03c2 100644 --- a/apt-pkg/deb/debrecords.cc +++ b/apt-pkg/deb/debrecords.cc @@ -101,6 +101,15 @@ string debRecordParser::Maintainer() return Section.FindS("Maintainer"); } /*}}}*/ +// RecordParser::RecordField - Return the value of an arbitrary field /*{{*/ +// --------------------------------------------------------------------- +/* */ +string debRecordParser::RecordField(const char *fieldName) +{ + return Section.FindS(fieldName); +} + + /*}}}*/ // RecordParser::ShortDesc - Return a 1 line description /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h index 9692ac94c..7868bfa3d 100644 --- a/apt-pkg/deb/debrecords.h +++ b/apt-pkg/deb/debrecords.h @@ -50,6 +50,9 @@ class debRecordParser : public pkgRecords::Parser virtual string Name(); virtual string Homepage(); + // An arbitrary custom field + virtual string RecordField(const char *fieldName); + virtual void GetRec(const char *&Start,const char *&Stop); debRecordParser(string FileName,pkgCache &Cache); diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h index 78e39e577..ce92cacc4 100644 --- a/apt-pkg/pkgrecords.h +++ b/apt-pkg/pkgrecords.h @@ -69,7 +69,10 @@ class pkgRecords::Parser /*{{{*/ virtual string LongDesc() {return string();}; virtual string Name() {return string();}; virtual string Homepage() {return string();} - + + // An arbitrary custom field + virtual string RecordField(const char *fieldName) { return string();}; + // The record in binary form virtual void GetRec(const char *&Start,const char *&Stop) {Start = Stop = 0;}; diff --git a/debian/changelog b/debian/changelog index c8af59ab2..08635cae7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ apt (0.8.16~exp4) UNRELEASED; urgency=low - cleanup old ABI break avoidance hacks * [ABI break] apt-pkg/acquire-item.{cc,h}: - cleanup around OptionalIndexTarget and SubIndexTarget + * [ABI break] merged patch from Jonathan Thomas to have a new + RecordField() function in the pkgRecorder parser. Many thanks + Thomas -- Julian Andres Klode <jak@debian.org> Wed, 20 Jul 2011 16:23:55 +0200 |