diff options
| -rw-r--r-- | apt-pkg/versionmatch.cc | 10 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 5 insertions, 6 deletions
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; diff --git a/debian/changelog b/debian/changelog index b477fdf75..3895771a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -96,6 +96,7 @@ apt (0.5.4.9) unstable; urgency=low * Change http message 'Waiting for file' to 'Waiting for headers'. Closes: #178537 * Remove trailing lines on package lists in apt-get. Closes: #178736. + * Fix origin pins for file:// uris. Closes: #189014. -- Adam Heath <doogie@debian.org> Sun, 02 Feb 2003 02:54:45 -0600 |