diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-04-05 11:41:08 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-04-05 11:41:08 +0200 |
commit | a70b91850530b48f5a15bee95d80a3941cf6e85c (patch) | |
tree | c6c581d26883e5bed0209a080b9f9d8cab92f256 /apt-pkg/deb/deblistparser.h | |
parent | 6f09926a8f20f1833ab16572a78f251930bdd293 (diff) | |
parent | 00870bf52186b5adb9819c707b411ac2fffe482b (diff) |
merged from the debian-sid branch
Diffstat (limited to 'apt-pkg/deb/deblistparser.h')
-rw-r--r-- | apt-pkg/deb/deblistparser.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 4bc1bd93c..d62ce641c 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -40,6 +40,7 @@ class debListParser : public pkgCacheGenerator::ListParser bool ParseDepends(pkgCache::VerIterator &Ver,const char *Tag, unsigned int Type); bool ParseProvides(pkgCache::VerIterator &Ver); + bool NewProvidesAllArch(pkgCache::VerIterator &Ver, string const &Package, string const &Version); static bool GrabWord(string Word,WordList *List,unsigned char &Out); public: @@ -69,7 +70,7 @@ class debListParser : public pkgCacheGenerator::ListParser static const char *ParseDepends(const char *Start,const char *Stop, string &Package,string &Ver,unsigned int &Op, bool const &ParseArchFlags = false, - bool const &StripMultiArch = false); + bool const &StripMultiArch = true); static const char *ConvertRelation(const char *I,unsigned int &Op); debListParser(FileFd *File, string const &Arch = ""); |