From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 21 Jul 2009 11:52:48 +0000 (+0200)
Subject: * apt-pkg/deb/dpkgpm.cc:
X-Git-Tag: 0.7.22~16^2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/4b7cfe96d621ab8fc0cec1334f0cd5f9ea87bf6d?ds=sidebyside

* apt-pkg/deb/dpkgpm.cc:
  - provide DPkg::Chroot-Directory config option (useful for testing)
---

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 416860f35..f787f365e 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -866,6 +866,15 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 	 }
 	 close(fd[0]); // close the read end of the pipe
 
+	 if (_config->FindDir("DPkg::Chroot-Directory","/") != "/") 
+	 {
+	    std::cerr << "Chrooting into " 
+		      << _config->FindDir("DPkg::Chroot-Directory") 
+		      << std::endl;
+	    if (chroot(_config->FindDir("DPkg::Chroot-Directory","/").c_str()) != 0)
+	       _exit(100);
+	 }
+
 	 if (chdir(_config->FindDir("DPkg::Run-Directory","/").c_str()) != 0)
 	    _exit(100);
 	 
diff --git a/debian/changelog b/debian/changelog
index 65fd9e590..cf9231105 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ apt (0.7.21) UNRELEASED; urgency=low
   * methods/http.cc:
     - ignore SIGPIPE, we deal with EPIPE from write in 
       HttpMethod::ServerDie() (LP: #385144)
+  * apt-pkg/deb/dpkgpm.cc:
+    - provide DPkg::Chroot-Directory config option (useful for testing)
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 28 May 2009 17:51:42 +0200