← Back to branch summary

~ubuntu-branches/ubuntu/natty/apt/natty

« back to all changes in this revision

Viewing changes to apt-pkg/deb/deblistparser.h

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2011-04-05 13:19:56 UTC
  • Revision ID: james.westby@ubuntu.com-20110405131956-u6sgfjr30zvy2fr3
Tags: 0.8.13.2ubuntu1
https://launchpad.net/bugs/733741
* merge fixes from debian-sid, most notable the handling of
  arch=all architectures in python-apt (LP: #733741)
* apt-pkg/aptconfiguration.cc:
  - fix comparing for a empty string

Show diffs side-by-side

added added

removed removed

Lines of Context:
apt-pkg/deb/deblistparser.h
40
40
   bool ParseDepends(pkgCache::VerIterator &Ver,const char *Tag,
41
41
                     unsigned int Type);
42
42
   bool ParseProvides(pkgCache::VerIterator &Ver);
 
43
   bool NewProvidesAllArch(pkgCache::VerIterator &Ver, string const &Package, string const &Version);
43
44
   static bool GrabWord(string Word,WordList *List,unsigned char &Out);
44
45
   
45
46
   public:
69
70
   static const char *ParseDepends(const char *Start,const char *Stop,
70
71
                            string &Package,string &Ver,unsigned int &Op,
71
72
                            bool const &ParseArchFlags = false,
72
 
                            bool const &StripMultiArch = false);
 
73
                            bool const &StripMultiArch = true);
73
74
   static const char *ConvertRelation(const char *I,unsigned int &Op);
74
75
 
75
76
   debListParser(FileFd *File, string const &Arch = "");