moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-21 23:38:49 -05:00
Code Issues Releases Wiki Activity

util.py: return the created path

Browse Source 
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Andrew Gregory 2015-10-16 20:28:29 -04:00 committed by Allan McRae
parent 60ebee7a6e
commit 4ceb1c5bf9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/pacman/pmpkg.py
View File

@ -174,8 +174,7 @@ class pmpkg(object):
def install_package(self, root): def install_package(self, root):
"""Install the package in the given root.""" """Install the package in the given root."""
for f in self.files: for f in self.files:
util.mkfile(root, f, f) path = util.mkfile(root, f, f)
path = os.path.join(root, f)
if os.path.isfile(path): if os.path.isfile(path):
os.utime(path, (355, 355)) os.utime(path, (355, 355))

3
test/pacman/pmtest.py
View File

@ -180,8 +180,7 @@ class pmtest(object):
vprint(" Populating file system") vprint(" Populating file system")
for f in self.filesystem: for f in self.filesystem:
vprint("\t%s" % f) vprint("\t%s" % f)
util.mkfile(self.root, f, f) path = util.mkfile(self.root, f, f)
path = os.path.join(self.root, f)
if os.path.isfile(path): if os.path.isfile(path):
os.utime(path, (355, 355)) os.utime(path, (355, 355))
for pkg in self.db["local"].pkgs: for pkg in self.db["local"].pkgs:

4
test/pacman/util.py
View File

@ -84,7 +84,7 @@ def mkfile(base, name, data=""):
if info["isdir"]: if info["isdir"]:
if not os.path.isdir(path): if not os.path.isdir(path):
os.makedirs(path, 0o755) os.makedirs(path, 0o755)
return return path
dir_path = os.path.dirname(path) dir_path = os.path.dirname(path)
if dir_path and not os.path.isdir(dir_path): if dir_path and not os.path.isdir(dir_path):
@ -98,6 +98,8 @@ def mkfile(base, name, data=""):
if info["perms"]: if info["perms"]:
os.chmod(path, info["perms"]) os.chmod(path, info["perms"])
return path
def writedata(filename, data): def writedata(filename, data):
if isinstance(data, list): if isinstance(data, list):
data = "\n".join(data) data = "\n".join(data)