diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:58:13 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:58:13 +0000 |
| commit | 0a5e4a031a039329cc0d27268be6a623e892c452 (patch) | |
| tree | 2d3f7460b3d2d550765c2a63a7e99c1fcb12f0c0 | |
| parent | 42195eb2ff28c597dd9d2eeddd05ea4c7b146af8 (diff) | |
Fixed matching all releases
Author: jgg
Date: 2001-05-29 03:07:12 GMT
Fixed matching all releases
| -rw-r--r-- | apt-pkg/versionmatch.cc | 10 | ||||
| -rw-r--r-- | apt-pkg/versionmatch.h | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index d4ae21d56..8e8e2d2d1 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: versionmatch.cc,v 1.4 2001/05/22 06:20:06 jgg Exp $ +// $Id: versionmatch.cc,v 1.5 2001/05/29 03:07:12 jgg Exp $ /* ###################################################################### Version Matching @@ -48,7 +48,12 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type) { // All empty = match all if (Data == "*") + { + MatchAll = true; return; + } + + MatchAll = false; // Are we a simple specification? string::const_iterator I = Data.begin(); @@ -163,6 +168,9 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File) { if (Type == Release) { + if (MatchAll == true) + return true; + /* cout << RelVerStr << ',' << RelOrigin << ',' << RelArchive << ',' << RelLabel << endl; cout << File.Version() << ',' << File.Origin() << ',' << File.Archive() << ',' << File.Label() << endl;*/ diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h index 878b3eb6a..7ca39cbe8 100644 --- a/apt-pkg/versionmatch.h +++ b/apt-pkg/versionmatch.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: versionmatch.h,v 1.3 2001/05/07 04:24:08 jgg Exp $ +// $Id: versionmatch.h,v 1.4 2001/05/29 03:07:12 jgg Exp $ /* ###################################################################### Version Matching @@ -53,7 +53,8 @@ class pkgVersionMatch string RelArchive; string RelLabel; string RelComponent; - + bool MatchAll; + // Origin Matching string OrSite; |