Fixed matching all releases

Author: jgg
Date: 2001-05-29 03:07:12 GMT
Fixed matching all releases

diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc
index d4ae21d565fb87c377975ce1775cc993eba218c1..8e8e2d2d175d20343ae8dc08aff6ebfb22a1c918 100644 (file)
--- a/apt-pkg/versionmatch.cc
+++ b/apt-pkg/versionmatch.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- 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 
 /* ######################################################################
 
    Version Matching 


@@ -48,7 +48,12 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
    {
       // All empty = match all
       if (Data == "*")
    {
       // All empty = match all
       if (Data == "*")

+      {
+        MatchAll = true;

         return;
         return;

+      }
+      
+      MatchAll = false;

       
       // Are we a simple specification?
       string::const_iterator I = Data.begin();
       
       // 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 (Type == Release)
    {

+      if (MatchAll == true)
+        return true;
+      

 /*      cout << RelVerStr << ',' << RelOrigin << ',' << RelArchive << ',' << RelLabel << endl;
       cout << File.Version() << ',' << File.Origin() << ',' << File.Archive() << ',' << File.Label() << endl;*/
       
 /*      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 878b3eb6ae97efe0557140f42ddfc404c55aefae..7ca39cbe83f9d195a735b95d8222c7011df850da 100644 (file)
--- a/apt-pkg/versionmatch.h
+++ b/apt-pkg/versionmatch.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- 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 
 /* ######################################################################
 
    Version Matching 


@@ -53,7 +53,8 @@ class pkgVersionMatch
    string RelArchive;
    string RelLabel;
    string RelComponent;
    string RelArchive;
    string RelLabel;
    string RelComponent;

-
+   bool MatchAll;
+   

    // Origin Matching
    string OrSite;
    
    // Origin Matching
    string OrSite;