From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 8 Oct 2011 12:21:38 +0000 (+0200)
Subject: server: Fix packaging of source packages.
X-Git-Tag: 0.9.13~9^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=269c59f347e211a9256b6679abddddb61c8334b5;p=pakfire.git

server: Fix packaging of source packages.
---

diff --git a/python/pakfire/base.py b/python/pakfire/base.py
index 2b2fd54f2..53314d695 100644
--- a/python/pakfire/base.py
+++ b/python/pakfire/base.py
@@ -471,11 +471,7 @@ class Pakfire(object):
 			b.stop()
 
 	def dist(self, pkgs, resultdirs=None):
-		if not resultdirs:
-			resultdirs = []
-
-		# Always include local repository
-		resultdirs.append(self.repos.local_build.path)
+		assert resultdirs
 
 		for pkg in pkgs:
 			pkg = packages.Makefile(self, pkg)
diff --git a/python/pakfire/cli.py b/python/pakfire/cli.py
index 677b28a9a..4466570c8 100644
--- a/python/pakfire/cli.py
+++ b/python/pakfire/cli.py
@@ -511,7 +511,7 @@ class CliServer(Cli):
 		# Finally parse all arguments from the command line and save them.
 		self.args = self.parser.parse_args()
 
-		self.server = server.Server()
+		self.server = server.Server(**self.pakfire_args)
 
 		self.action2func = {
 			"build"      : self.handle_build,
diff --git a/python/pakfire/server.py b/python/pakfire/server.py
index 14e7f158a..5f7c82348 100644
--- a/python/pakfire/server.py
+++ b/python/pakfire/server.py
@@ -219,6 +219,8 @@ class Server(object):
 		self.conn = xmlrpclib.ServerProxy(server, transport=XMLRPCTransport(),
 			allow_none=True)
 
+		self.pakfire_args = pakfire_args
+
 	@property
 	def hostname(self):
 		"""
@@ -414,7 +416,8 @@ class Server(object):
 
 		source = Source(self, **build["source"])
 
-		repo = source.update_revision(build["revision"], build_id=build_id)
+		repo = source.update_revision(build["revision"], build_id=build_id,
+			**self.pakfire_args)
 
 		try:
 			# Upload all files in the repository.