X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/0a5e4a031a039329cc0d27268be6a623e892c452..f8ac1720a94468d1384e88a57729e6d9801b56fd:/apt-pkg/versionmatch.cc

diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc
index 8e8e2d2d1..9e341852b 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.5 2001/05/29 03:07:12 jgg Exp $
+// $Id: versionmatch.cc,v 1.9 2003/05/19 17:58:26 doogie Exp $
 /* ######################################################################
 
    Version Matching 
@@ -28,6 +28,10 @@
 /* Break up the data string according to the selected type */
 pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
 {
+   MatchAll = false;
+   VerPrefixMatch = false;
+   RelVerPrefixMatch = false;
+   
    if (Type == None || Data.length() < 1)
       return;
    
@@ -53,8 +57,6 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
 	 return;
       }
       
-      MatchAll = false;
-      
       // Are we a simple specification?
       string::const_iterator I = Data.begin();
       for (; I != Data.end() && *I != '='; I++);
@@ -66,7 +68,7 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
 	 else
 	    RelArchive = Data;
 	 
-	 if (RelVerStr.end()[-1] == '*')
+	 if (RelVerStr.length() > 0 && RelVerStr.end()[-1] == '*')
 	 {
 	    RelVerPrefixMatch = true;
 	    RelVerStr = string(RelVerStr.begin(),RelVerStr.end()-1);
@@ -206,11 +208,13 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File)
    
    if (Type == Origin)
    {
-      if (OrSite.empty() == false)
-	 if (File->Site == 0 ||
-	     OrSite != File.Site())
+      if (OrSite.empty() == false) {
+	 if (File->Site == 0 || OrSite != File.Site())
 	    return false;
-      return true;
+      } else // so we are talking about file:// or status file
+	 if (strcmp(File.Site(),"") == 0 && File->Archive != 0) // skip the status file
+	    return false;
+      return (OrSite == File.Site());		/* both strings match */
    }
    
    return false;