]> git.ipfire.org Git - pakfire.git/commitdiff
Make is possible to pass makefiles to pakfire-builder shell ... again.
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Oct 2012 20:19:07 +0000 (22:19 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Oct 2012 20:19:07 +0000 (22:19 +0200)
python/pakfire/base.py

index 628a7962573e11a2add1127d2215a3a5f3d5e9c1..495af553d5eb82e848b5792e4643bc711abfba09 100644 (file)
@@ -641,7 +641,6 @@ class PakfireBuilder(Pakfire):
                return pkg.dist(resultdir=resultdir)
 
        def build(self, pkg, resultdirs=None, shell=False, install_test=True, after_shell=False, **kwargs):
-
                # As the BuildEnviron is only able to handle source packages, we must package makefiles.
                if pkg.endswith(".%s" % MAKEFILE_EXTENSION):
                        pkg = self.dist(pkg, resultdir=LOCAL_TMP_PATH)
@@ -688,6 +687,10 @@ class PakfireBuilder(Pakfire):
                        b.stop()
 
        def shell(self, pkg, **kwargs):
+               # As the BuildEnviron is only able to handle source packages, we must package makefiles.
+               if pkg.endswith(".%s" % MAKEFILE_EXTENSION):
+                       pkg = self.dist(pkg, resultdir=LOCAL_TMP_PATH)
+
                b = builder.BuildEnviron(self, pkg, **kwargs)
 
                try: