diff --git a/pisi/actionsapi/pisitools.py b/pisi/actionsapi/pisitools.py index 2a87751f..a5f0ec67 100644 --- a/pisi/actionsapi/pisitools.py +++ b/pisi/actionsapi/pisitools.py @@ -21,11 +21,12 @@ dirs = glb.dirs def insinto(directory, filename): - makedirs(env.install_dir + directory) + makedirs(env.install_dir + directory) - if os.access(filename, os.F_OK): - copy_file(filename, env.install_dir + - directory + os.path.basename(filename)) + for file in glob.glob(filename): + if os.access(file, os.F_OK): + copy_file(file, env.install_dir + + directory + os.path.basename(file)) def dodoc(*documentList): @@ -111,7 +112,7 @@ def dodir(parameters = ''): makedirs(env.install_dir + parameters) def remove(filename): - + unlink(env.install_dir + filename) def removeDir(dirname): diff --git a/pisi/actionsapi/utils.py b/pisi/actionsapi/utils.py index fac4706a..4798758a 100644 --- a/pisi/actionsapi/utils.py +++ b/pisi/actionsapi/utils.py @@ -6,8 +6,8 @@ import os import time from tempfile import mkstemp, mkdtemp -def sleep(sleep_time = 5): - time.sleep(sleep_time) +def sleep(seconds = 5): + time.sleep(seconds) def createTmpFile(): handle, path = mkstemp()