use consistently the last : as name:arch separator

Proper debian packages do not contain ':' in the package name, so for
real packages this is a non-issue, but apt itself frequently makes use
of packages with such an illegal name for internal proposes.

Git-Dch: Ignore

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index d2ecb8b1f394d14f5a44ddd6569a536b95b7cfff..d6dd169bbb8dc6b05386e5157aa88ac8a3ea7d37 100644 (file)
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -263,7 +263,7 @@ pkgCache::PkgIterator pkgCache::FindPkg(const string &Name) {
 }
 
 pkgCache::PkgIterator pkgCache::FindPkg(StringView Name) {
-       auto const found = Name.find(':');
+       auto const found = Name.rfind(':');
        if (found == string::npos)
           return FindPkg(Name, "native");
        auto const Arch = Name.substr(found+1);

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 6e307fba9b32df572709ea1a324815bb7aeeb3d5..0dbac3df8d4319ff08f31f5e308b490a884a21e2 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -659,7 +659,7 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg, StringView Name,
    // lazy-create foo (of amd64) provides foo:amd64 at the time we first need it
    if (Arch == "any")
    {
-      size_t const found = Name.find(':');
+      size_t const found = Name.rfind(':');
       StringView ArchA = Name.substr(found + 1);
       if (ArchA != "any")
       {