]> git.ipfire.org Git - pakfire.git/commitdiff
Don't go to shell by default.
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 13 Apr 2011 20:12:23 +0000 (22:12 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 13 Apr 2011 20:12:23 +0000 (22:12 +0200)
pakfire/base.py
pakfire/cli.py

index fae49df1383fc491d5d980cd121d20bc6024ac1c..79caf70934e0fba3d9705715d8121fe6bc8583ac 100644 (file)
@@ -170,7 +170,7 @@ class Pakfire(object):
                return [p.name for p in pkgs]
 
        @staticmethod
-       def build(pkg, resultdirs=None, **kwargs):
+       def build(pkg, resultdirs=None, shell=False, **kwargs):
                if not resultdirs:
                        resultdirs = []
 
@@ -194,7 +194,10 @@ class Pakfire(object):
                                b.copy_result(resultdir)
 
                except BuildError:
-                       b.shell()
+                       if shell:
+                               b.shell()
+                       else:
+                               raise
 
                finally:
                        b.destroy()
index d4c1864084219723baa65cbc208d7ed2b0126625..a860e1c93686aef9126cf951bc76427e37a2ca3a 100644 (file)
@@ -349,7 +349,7 @@ class CliBuilder(Cli):
                }
 
                pakfire.build(pkg, distro_config=distro_config, resultdirs=[self.args.resultdir,],
-                       **self.pakfire_args)
+                       shell=True, **self.pakfire_args)
 
        def handle_shell(self):
                pkg = None