]> git.ipfire.org Git - pakfire.git/commitdiff
Fix PARALLELISMFLAGS.
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 2 Oct 2011 19:11:43 +0000 (21:11 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 2 Oct 2011 19:11:43 +0000 (21:11 +0200)
This was an environment variable but that was wrong.

python/pakfire/builder.py
python/pakfire/packages/make.py

index 75e81fa05e8f18687755d6f37bf065931ebf076a..b81d9aea9790368d2c24f9a28a3e44a3f4dab6a8 100644 (file)
@@ -590,7 +590,6 @@ class Builder(object):
 
                self._environ = {
                        "LANG"             : "C",
-                       "PARALLELISMFLAGS" : "-j%s" % util.calc_parallelism(),
                }
 
        @property
index c81124cbdcb3a1777afe4f017e1999b8dde3c227..2019f47f69165c3b25165ff36610d0fa17450cd6 100644 (file)
@@ -49,9 +49,14 @@ class MakefileBase(Package):
                # Save the filename of the makefile.
                self.filename = os.path.abspath(filename)
 
+               # Update environment.
+               environ = self.pakfire.environ
+               environ.update({
+                       "PARALLELISMFLAGS" : "-j%s" % util.calc_parallelism(),
+               })
+
                # Open and parse the makefile.
-               self.lexer = lexer.RootLexer.open(self.filename,
-                       environ=self.pakfire.environ)
+               self.lexer = lexer.RootLexer.open(self.filename, environ=environ)
 
        @property
        def package_filename(self):