server: Fix packaging of source packages.

diff --git a/python/pakfire/base.py b/python/pakfire/base.py
index 2b2fd54f28a147a68208376a6bdd270c9df21ab5..53314d695e34f75a285c1183ae0f51a08071c329 100644 (file)
--- 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 677b28a9a420dda1008c9fe253bcbfcf72d229ff..4466570c8afc8a3930a0859943d5d0496ea8a3fc 100644 (file)
--- 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 14e7f158a8e58285482066cbd03a06a6027cd3a9..5f7c823483d17c7c9ddc0f4a7329f9081dabc2fd 100644 (file)
--- 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.