summaryrefslogtreecommitdiff
path: root/apt-pkg/deb
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-01-02 13:19:32 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2016-01-02 16:19:40 +0100
commite21ba62847687b5dc655b28ef7dd67d6eb7336e2 (patch)
tree2a8e27b136138e5ca865373db2dd864c76b4af65 /apt-pkg/deb
parent55153bf94ff28a23318e79aa48242244c4d82b3c (diff)
support comments in debian/control parsing
Now (55153bf94ff28a23318e79aa48242244c4d82b3c) that pkgTagFile can be told to deal with all sorts of comments we can use this mode to parse dsc (as by catch) and debian/control files properly even in the wake of multiline fields spliced with comments like Build-Depends. Closes: 806775
Diffstat (limited to 'apt-pkg/deb')
-rw-r--r--apt-pkg/deb/debsrcrecords.cc14
1 files changed, 10 insertions, 4 deletions
diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index cef7ad10e..cefaf46ac 100644
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -33,8 +33,14 @@ using std::max;
using std::string;
debSrcRecordParser::debSrcRecordParser(std::string const &File,pkgIndexFile const *Index)
- : Parser(Index), d(NULL), Fd(File,FileFd::ReadOnly, FileFd::Extension), Tags(&Fd,102400),
- iOffset(0), Buffer(NULL) {}
+ : Parser(Index), d(NULL), Tags(&Fd), iOffset(0), Buffer(NULL)
+{
+ if (File.empty() == false)
+ {
+ if (Fd.Open(File, FileFd::ReadOnly, FileFd::Extension))
+ Tags.Init(&Fd, 102400);
+ }
+}
// SrcRecordParser::Binaries - Return the binaries field /*{{{*/
// ---------------------------------------------------------------------
@@ -260,7 +266,7 @@ debSrcRecordParser::~debSrcRecordParser()
debDscRecordParser::debDscRecordParser(std::string const &DscFile, pkgIndexFile const *Index)
- : debSrcRecordParser(DscFile, Index)
+ : debSrcRecordParser("", Index)
{
// support clear signed files
if (OpenMaybeClearSignedFile(DscFile, Fd) == false)
@@ -270,7 +276,7 @@ debDscRecordParser::debDscRecordParser(std::string const &DscFile, pkgIndexFile
}
// re-init to ensure the updated Fd is used
- Tags.Init(&Fd);
+ Tags.Init(&Fd, pkgTagFile::SUPPORT_COMMENTS);
// read the first (and only) record
Step();