From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 13 Apr 2011 20:12:23 +0000 (+0200)
Subject: Don't go to shell by default.
X-Git-Tag: 0.9.3~47^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dacaa18b94b0cab27a715b8734f668174382328d;p=pakfire.git

Don't go to shell by default.
---

diff --git a/pakfire/base.py b/pakfire/base.py
index fae49df13..79caf7093 100644
--- a/pakfire/base.py
+++ b/pakfire/base.py
@@ -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()
diff --git a/pakfire/cli.py b/pakfire/cli.py
index d4c186408..a860e1c93 100644
--- a/pakfire/cli.py
+++ b/pakfire/cli.py
@@ -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