summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Conder <j@skurvy.no-ip.org>2010-08-19 00:07:18 +1200
committerDan McGee <dan@archlinux.org>2010-08-27 10:58:08 -0500
commit90c45f7bbe6811a2f32ef81e57bce8237d491e9f (patch)
tree03e75c0d054fcc9f50ce109f4f8b36c7365a8101
parent9fbf5d9336455649528843efe9a551291dafb257 (diff)
downloadpacman-90c45f7bbe6811a2f32ef81e57bce8237d491e9f.tar.xz
pactest: add shell to fake root environment
Adds a shell to the fake root set up for pactests, which was not needed previously due to a bug (debian #582847) in fakechroot. Signed-off-by: Jonathan Conder <j@skurvy.no-ip.org>
-rwxr-xr-xtest/pacman/pmtest.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py
index f2b96760..f3026f29 100755
--- a/test/pacman/pmtest.py
+++ b/test/pacman/pmtest.py
@@ -110,10 +110,13 @@ class pmtest:
tmpdir = os.path.join(self.root, TMPDIR)
logdir = os.path.join(self.root, os.path.dirname(LOGFILE))
etcdir = os.path.join(self.root, os.path.dirname(PACCONF))
- for dir in [dbdir, cachedir, syncdir, tmpdir, logdir, etcdir]:
+ bindir = os.path.join(self.root, "bin")
+ for dir in [dbdir, cachedir, syncdir, tmpdir, logdir, etcdir, bindir]:
if not os.path.isdir(dir):
vprint("\t%s" % dir[len(self.root)+1:])
os.makedirs(dir, 0755)
+ # Only the dynamically linked binary is needed for fakechroot
+ shutil.copy("/bin/sh", bindir)
# Configuration file
vprint(" Creating configuration file")