X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b49068c566d749130e023536d54588c948c16edf..475f75506db48a7fa90711fce4ed129f6a14cc9a:/apt-pkg/deb/debsystem.cc?ds=sidebyside

diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index dcd115b50..fd702b3c6 100644
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -86,7 +86,7 @@ bool debSystem::Lock()
    }
 
    // Create the lockfile
-   string AdminDir = flNotFile(_config->Find("Dir::State::status"));
+   string AdminDir = flNotFile(_config->FindFile("Dir::State::status"));
    d->LockFD = GetLock(AdminDir + "lock");
    if (d->LockFD == -1)
    {
@@ -145,7 +145,7 @@ bool debSystem::UnLock(bool NoErrors)
 bool debSystem::CheckUpdates()
 {
    // Check for updates.. (dirty)
-   string File = flNotFile(_config->Find("Dir::State::status")) + "updates/";
+   string File = flNotFile(_config->FindFile("Dir::State::status")) + "updates/";
    DIR *DirP = opendir(File.c_str());
    if (DirP == 0)
       return false;
@@ -184,13 +184,35 @@ 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) {
+   auto const cnfstatedir = Cnf.Find("Dir::State", "var/lib/apt/");
+   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");
+   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;
+}
 bool debSystem::Initialize(Configuration &Cnf)
 {
    /* These really should be jammed into a generic 'Local Database' engine
       which is yet to be determined. The functions in pkgcachegen should
       be the only users of these */
    Cnf.CndSet("Dir::State::extended_states", "extended_states");
-   Cnf.CndSet("Dir::State::status","/var/lib/dpkg/status");
+   if (Cnf.Exists("Dir::State::status") == false)
+      Cnf.Set("Dir::State::status", getDpkgStatusLocation(Cnf));
    Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg");
 
    if (d->StatusFile) {
@@ -221,7 +243,7 @@ signed debSystem::Score(Configuration const &Cnf)
    signed Score = 0;
    if (FileExists(Cnf.FindFile("Dir::State::status","/var/lib/dpkg/status")) == true)
        Score += 10;
-   if (FileExists(Cnf.FindFile("Dir::Bin::dpkg","/usr/bin/dpkg")) == true)
+   if (FileExists(Cnf.Find("Dir::Bin::dpkg","/usr/bin/dpkg")) == true)
       Score += 10;
    if (FileExists("/etc/debian_version") == true)
       Score += 10;
@@ -399,10 +421,10 @@ std::vector<std::string> debSystem::SupportedArchitectures()		/*{{{*/
 	 char* tok_saveptr;
 	 char* arch = strtok_r(buf, " ", &tok_saveptr);
 	 while (arch != NULL) {
-	    for (; isspace(*arch) != 0; ++arch);
+	    for (; isspace_ascii(*arch) != 0; ++arch);
 	    if (arch[0] != '\0') {
 	       char const* archend = arch;
-	       for (; isspace(*archend) == 0 && *archend != '\0'; ++archend);
+	       for (; isspace_ascii(*archend) == 0 && *archend != '\0'; ++archend);
 	       string a(arch, (archend - arch));
 	       if (std::find(archs.begin(), archs.end(), a) == archs.end())
 		  archs.push_back(a);