From 5955efd49da342d6621f391af5f880336775001e Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 17:01:06 +0000
Subject: Fix origin pins for file:// uris. Author: doogie Date: 2003-04-24
 03:16:58 GMT Fix origin pins for file:// uris.

---
 apt-pkg/versionmatch.cc | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'apt-pkg/versionmatch.cc')

diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc
index 0ca850dc8..1abb7e4ad 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.7 2002/11/06 06:43:14 jgg Exp $
+// $Id: versionmatch.cc,v 1.8 2003/04/24 03:16:58 doogie Exp $
 /* ######################################################################
 
    Version Matching 
@@ -208,11 +208,9 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File)
    
    if (Type == Origin)
    {
-      if (OrSite.empty() == false)
-	 if (File->Site == 0 ||
-	     OrSite != File.Site())
-	    return false;
-      return true;
+      if (!strcmp(File.Archive(), "now"))	/* ignore local "status" file */
+	 return false;
+      return (OrSite == File.Site());		/* both strings match */
    }
    
    return false;
-- 
cgit v1.2.3