diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-02-13 10:25:04 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-02-13 10:25:04 +0000 |
| commit | 5e972bffae68a75aafc9f9b639e82e252fde3b8b (patch) | |
| tree | 14bea4042f1d0a434b8fa183fa2fc06e51b0a12a /apt-pkg | |
| parent | 79b41ef196ed0ec3cfda58cc5d17c4f6ef6423e0 (diff) | |
| parent | fe5d48773170773390b4b8ce731d2851d703a412 (diff) | |
* merged with mainline
Patches applied:
* bubulle@debian.org--2005/apt--main--0--patch-167
Resync with Michael
* bubulle@debian.org--2005/apt--main--0--patch-168
Vietnamese translation completed
* bubulle@debian.org--2005/apt--main--0--patch-169
Update PO files and POT file...again
* bubulle@debian.org--2005/apt--main--0--patch-170
Compelted French translation
* bubulle@debian.org--2005/apt--main--0--patch-171
Activate Welsh translation
* bubulle@debian.org--2005/apt--main--0--patch-172
Completed to 512 strings
* bubulle@debian.org--2005/apt--main--0--patch-173
Russian translation completed
* bubulle@debian.org--2005/apt--main--0--patch-174
Swedish translation completed
* bubulle@debian.org--2005/apt--main--0--patch-175
Merge from Philippe Batailler French manpages tree/Vietnamese translation update
* bubulle@debian.org--2005/apt--main--0--patch-176
Galician translation update
* bubulle@debian.org--2005/apt--main--0--patch-177
Slovak translation update
* bubulle@debian.org--2005/apt--main--0--patch-178
Polish translation update
* bubulle@debian.org--2005/apt--main--0--patch-179
Correct permissions
* bubulle@debian.org--2005/apt--main--0--patch-180
Japanese translation update
* bubulle@debian.org--2005/apt--main--0--patch-181
Basque translation update
* bubulle@debian.org--2005/apt--main--0--patch-182
Catalan translation completed
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-123
* fix typo in apt-cache.8 manpage
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-124
* fixed another typo in doc/apt-secure.8.xml
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-125
* merged the debian-sid changes back
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-126
* fixed the changelog yet again
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-127
* merged with apt--mvo
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-128
* don't explod if a Provides has DepCompareOp
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-129
* fix regression about not working --print-uris in "install"
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-130
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-131
* create sources.list.d as well
* mvo@debian.org--2005/apt--debian-sid--0--patch-17
* merged with apt--mvo--0
* mvo@debian.org--2005/apt--debian-sid--0--patch-18
* merged with apt--mvo
* philippe.batailler@free.fr--2005/apt--main--0--patch-9
manpages
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/deb/deblistparser.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index b11d2531c..d0dc7a260 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -504,11 +504,12 @@ bool debListParser::ParseProvides(pkgCache::VerIterator Ver) Start = ParseDepends(Start,Stop,Package,Version,Op); if (Start == 0) return _error->Error("Problem parsing Provides line"); - if (Op != pkgCache::Dep::NoOp) - return _error->Error("Malformed provides line"); - - if (NewProvides(Ver,Package,Version) == false) - return false; + if (Op != pkgCache::Dep::NoOp) { + _error->Warning("Ignoring Provides line with DepCompareOp for package %s", Package.c_str()); + } else { + if (NewProvides(Ver,Package,Version) == false) + return false; + } if (Start == Stop) break; |