From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 20 Feb 2011 00:34:20 +0000 (+0100)
Subject: Fix resultdir in dist command.
X-Git-Tag: 0.9.3~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0fc159cebcb729fd94843a7c15ab18af274e0e9;p=pakfire.git

Fix resultdir in dist command.
---

diff --git a/pakfire/__init__.py b/pakfire/__init__.py
index 8ed7801a6..57f9b78f9 100644
--- a/pakfire/__init__.py
+++ b/pakfire/__init__.py
@@ -133,18 +133,27 @@ class Pakfire(object):
 		finally:
 			b.cleanup()
 
-	def dist(self, pkg, resultdir=None):
+	def dist(self, pkg, resultdirs=None):
 		self.check_build_mode()
 
 		b = builder.Builder(pakfire=self, pkg=pkg)
 		b.extract(build_deps=False)
 
-		if not resultdir:
-			resultdir = self.config.get("resultdir")
+		if not resultdirs:
+			resultdirs = []
+
+		# Always include local repository
+		resultdirs.append(self.repos.local_build.path)
 
 		try:
 			b.dist()
-			b.copy_result(resultdir)
+
+			# Copy-out all resultfiles
+			for resultdir in resultdirs:
+				if not resultdir:
+					continue
+
+				b.copy_result(resultdir)
 		finally:
 			b.cleanup()
 
diff --git a/pakfire/cli.py b/pakfire/cli.py
index 18f952f8f..ae32c809f 100644
--- a/pakfire/cli.py
+++ b/pakfire/cli.py
@@ -345,7 +345,7 @@ class CliBuilder(Cli):
 			# XXX walk through the source tree and find a matching makefile
 			pass
 
-		self.pakfire.dist(pkg, self.args.resultdir)
+		self.pakfire.dist(pkg, resultdirs=[self.args.resultdir,])
 
 	def handle_repo_create(self):
 		path = self.args.path[0]