Merge branch 'maint'

2 files changed, 5 insertions, 2 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 674c7ba2..4bf0c41d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -523,7 +523,7 @@ msgstr "      --noscriptlet    不执行安装小脚本\n"
 
 #, c-format
 msgid "  -v, --verbose        be verbose\n"
-msgstr "  -v, --verbose        循环执行\n"
+msgstr "  -v, --verbose        显示详细信息\n"
 
 #, c-format
 msgid "      --debug          display debug messages\n"
diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py
index b1d778e1..5c8881c8 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")