diff options
| -rw-r--r-- | apt-pkg/versionmatch.cc | 9 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index 093180f9b..17a54bc4c 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -118,7 +118,10 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type) if (Type == Origin) { - OrSite = Data; + if (Data[0] == '"' && Data.end()[-1] == '"') + OrSite = Data.substr(1, Data.length() - 2); + else + OrSite = Data; return; } } @@ -259,10 +262,10 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File) if (Type == Origin) { if (OrSite.empty() == false) { - if (File->Site == 0 || !ExpressionMatches(OrSite, File.Site())) + if (File->Site == 0) return false; } else // so we are talking about file:// or status file - if (strcmp(File.Site(),"") == 0 && File->Archive != 0) // skip the status file + if (strcmp(File.Site(),"") == 0 && File->Archive != 0 && strcmp(File.Archive(),"now") == 0) // skip the status file return false; return (ExpressionMatches(OrSite, File.Site())); /* both strings match */ } diff --git a/debian/changelog b/debian/changelog index 072c00398..0d566f8b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,8 +29,12 @@ apt (0.8.1) UNRELEASED; urgency=low * apt-pkg/contrib/configuration.cc: - fix autoremove by using correct config-option name and don't make faulty assumptions in error handling (Closes: #594689) + * apt-pkg/versionmatch.cc: + - let the pin origin actually work as advertised in the manpage + which means "" are optional and pinning a local archive does + work - even if it is a non-flat archive (Closes: #594435) - -- David Kalnischkies <kalnischkies@gmail.com> Sat, 28 Aug 2010 22:23:20 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Mon, 30 Aug 2010 11:38:50 +0200 apt (0.8.0) unstable; urgency=low |