]> git.ipfire.org Git - pakfire.git/commitdiff
Fix environment variable for icecream toolchain.
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 21 Oct 2011 15:06:38 +0000 (17:06 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 21 Oct 2011 15:14:40 +0000 (17:14 +0200)
python/pakfire/builder.py

index ceb1b290d9e59a072dbfccdd1f3c06ccd7b2e8b1..ea3928340d7d4b1d0cec605df2cca73a8f062a58 100644 (file)
@@ -647,14 +647,14 @@ class Builder(object):
 
        def create_icecream_toolchain(self):
                try:
-                       out = self.do("icecc --build-native 2>/dev/null", returnOutput=True)
+                       out = self.do("icecc --build-native 2>/dev/null", returnOutput=True, cwd="/tmp")
                except Error:
                        return
 
                for line in out.splitlines():
                        m = re.match(r"^creating ([a-z0-9]+\.tar\.gz)", line)
                        if m:
-                               self._environ["icecream_toolchain"] = "/%s" % m.group(1)
+                               self._environ["ICECC_VERSION"] = "/tmp/%s" % m.group(1)
 
        def create_buildscript(self, stage):
                file = "/tmp/build_%s" % util.random_string()