diff --git a/pisi/actionsapi/actionglobals.py b/pisi/actionsapi/actionglobals.py index b47c2b78..5e06f1b6 100644 --- a/pisi/actionsapi/actionglobals.py +++ b/pisi/actionsapi/actionglobals.py @@ -32,8 +32,6 @@ class Env(object): else: return None - - class Dirs: """General directories used in actions API.""" # TODO: Eventually we should consider getting these from a/the @@ -50,9 +48,9 @@ class Dirs: class Flags: """General flags used in actions API""" values = pisi.config.config.values - host = values.build.host - cflags = values.build.cflags - cxxflags = values.build.cxxflags + environ["HOST"] = host = values.build.host + environ["CFLAGS"] = cflags = values.build.cflags + environ["CXXFLAGS"] = cxxflags = values.build.cxxflags ldflags = values.build.ldflags class ActionGlobals(pisi.config.Config): diff --git a/pisi/actionsapi/utils.py b/pisi/actionsapi/utils.py index 4798758a..37f8ae11 100644 --- a/pisi/actionsapi/utils.py +++ b/pisi/actionsapi/utils.py @@ -4,6 +4,7 @@ # stadard python modules import os import time +import glob from tempfile import mkstemp, mkdtemp def sleep(seconds = 5): @@ -18,7 +19,8 @@ def createTmpDir(): return path def chmod(filename, mode = 0755): - os.chmod(filename, mode) + for file in glob.glob(filename): + os.chmod(file, mode) def unlink(filename): os.unlink(filename) @@ -28,3 +30,7 @@ def makedirs(directoryName): os.makedirs(directoryName) except OSError: pass + +def touch(filename): + for file in glob.glob(filename): + os.utime(file, None)