bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint'

Browse source
This commit is contained in:
Dan McGee 2010-08-27 11:19:05 -05:00
commit d14a98db25
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
po/zh_CN.po
View file

@ -523,7 +523,7 @@ msgstr " --noscriptlet 不执行安装小脚本\n"
#, c-format #, c-format
msgid " -v, --verbose be verbose\n" msgid " -v, --verbose be verbose\n"
msgstr " -v, --verbose 循环执行\n" msgstr " -v, --verbose 显示详细信息\n"
#, c-format #, c-format
msgid " --debug display debug messages\n" msgid " --debug display debug messages\n"

5
test/pacman/pmtest.py
View file

@ -110,10 +110,13 @@ class pmtest:
tmpdir = os.path.join(self.root, TMPDIR) tmpdir = os.path.join(self.root, TMPDIR)
logdir = os.path.join(self.root, os.path.dirname(LOGFILE)) logdir = os.path.join(self.root, os.path.dirname(LOGFILE))
etcdir = os.path.join(self.root, os.path.dirname(PACCONF)) 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): if not os.path.isdir(dir):
vprint("\t%s" % dir[len(self.root)+1:]) vprint("\t%s" % dir[len(self.root)+1:])
os.makedirs(dir, 0755) os.makedirs(dir, 0755)
# Only the dynamically linked binary is needed for fakechroot
shutil.copy("/bin/sh", bindir)
# Configuration file # Configuration file
vprint(" Creating configuration file") vprint(" Creating configuration file")