Fix resultdir in dist command.

diff --git a/pakfire/__init__.py b/pakfire/__init__.py
index 8ed7801a6341aaad8df3adf364d5d32613e71c3a..57f9b78f9f54b308b3a722e37527696ecef6ddf5 100644 (file)
--- 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 18f952f8fb2af9a23d130d199a34ad087ab4963f..ae32c809fbf6344947cfb31b9d767588d69c468a 100644 (file)
--- 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]