Merge tag '1.3_rc2' into ubuntu

apt Debian release 1.3~rc2

2 files changed, 15 insertions, 13 deletions

diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 6a23b2c00..65bd3e6ee 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -80,7 +80,11 @@ debPackagesIndex::debPackagesIndex(IndexTarget const &Target, bool const Trusted
 std::string debPackagesIndex::ArchiveInfo(pkgCache::VerIterator const &Ver) const
 {
    std::string Res = Target.Description;
-   Res.erase(Target.Description.rfind(' '));
+   {
+      auto const space = Target.Description.rfind(' ');
+      if (space != std::string::npos)
+	 Res.erase(space);
+   }
 
    Res += " ";
    Res += Ver.ParentPkg().Name();
diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index fd702b3c6..f7968ec47 100644
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -184,26 +184,24 @@ pkgPackageManager *debSystem::CreatePM(pkgDepCache *Cache) const
 // System::Initialize - Setup the configuration space..			/*{{{*/
 // ---------------------------------------------------------------------
 /* These are the Debian specific configuration variables.. */
-static std::string getDpkgStatusLocation(Configuration &Cnf) {
+static std::string getDpkgStatusLocation(Configuration const &Cnf) {
+   Configuration PathCnf;
+   PathCnf.Set("Dir", Cnf.Find("Dir", "/"));
+   PathCnf.Set("Dir::State::status", "status");
    auto const cnfstatedir = Cnf.Find("Dir::State", "var/lib/apt/");
+   // if the state dir ends in apt, replace it with dpkg -
+   // for the default this gives us the same as the fallback below.
+   // This can't be a ../dpkg as that would play bad with symlinks
    std::string statedir;
    if (APT::String::Endswith(cnfstatedir, "/apt/"))
       statedir.assign(cnfstatedir, 0, cnfstatedir.length() - 5);
    else if (APT::String::Endswith(cnfstatedir, "/apt"))
       statedir.assign(cnfstatedir, 0, cnfstatedir.length() - 4);
    if (statedir.empty())
-      Cnf.Set("Dir::State", "var/lib/dpkg");
+      PathCnf.Set("Dir::State", "var/lib/dpkg");
    else
-      Cnf.Set("Dir::State", flCombine(statedir, "dpkg"));
-   auto const cnfrootdir = Cnf.Find("RootDir");
-   if (Cnf.Exists("RootDir") == true)
-      Cnf.Set("RootDir", "");
-   Cnf.Set("Dir::State::status", "status");
-   auto const statusfile = Cnf.FindFile("Dir::State::status");
-   if (cnfrootdir.empty() == false)
-      Cnf.Set("RootDir", cnfrootdir);
-   Cnf.Set("Dir::State", cnfstatedir);
-   return statusfile;
+      PathCnf.Set("Dir::State", flCombine(statedir, "dpkg"));
+   return PathCnf.FindFile("Dir::State::status");
 }
 bool debSystem::Initialize(Configuration &Cnf)
 {