Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit f5aa26bc8f8500764587ae781718623c894312cc
Author: Adam Samalik <asamalik(a)redhat.com>
Date: Tue Jul 8 09:13:21 2014 +0200
[backend] built pkgs - include subpackages
---------------------------------------------------------------
backend/backend/dispatcher.py | 4 ++--
backend/backend/mockremote.py | 20 +++++++++-----------
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/backend/backend/dispatcher.py b/backend/backend/dispatcher.py
index 34fd385..28ce803 100644
--- a/backend/backend/dispatcher.py
+++ b/backend/backend/dispatcher.py
@@ -309,7 +309,7 @@ class Worker(multiprocessing.Process):
jobdata.copr_name = build["copr"]["name"]
jobdata.pkg_version = ""
- jobdata.pkg_name = ""
+ jobdata.built_packages = ""
return jobdata
@@ -355,7 +355,7 @@ class Worker(multiprocessing.Process):
"status": job.status,
"chroot": job.chroot,
"pkg_version": job.pkg_version,
- "pkg_name": job.pkg_name,
+ "built_packages": job.built_packages,
}
data = {"builds": [build]}
diff --git a/backend/backend/mockremote.py b/backend/backend/mockremote.py
index a136843..203a9fb 100755
--- a/backend/backend/mockremote.py
+++ b/backend/backend/mockremote.py
@@ -410,9 +410,7 @@ class Builder(object):
else:
dest = pkg
- # get the package information
- # TODO
- # version
+ # srpm version
self.conn.module_name = "shell"
self.conn.module_args = "rpm -qp --qf \"%{VERSION}\n\" "+pkg
self.mockremote.callback.log("Getting package information: version")
@@ -420,14 +418,6 @@ class Builder(object):
if "contacted" in results:
build_details["pkg_version"] =
results["contacted"].itervalues().next()[u"stdout"]
- # name
- self.conn.module_name = "shell"
- self.conn.module_args = "rpm -qp --qf \"%{NAME}\n\" "+pkg
- self.mockremote.callback.log("Getting package information: name")
- results = self.conn.run()
- if "contacted" in results:
- build_details["pkg_name"] =
results["contacted"].itervalues().next()[u"stdout"]
-
# construct the mockchain command
buildcmd = "{0} -r {1} -l {2} ".format(
mockchain, pipes.quote(self.chroot),
@@ -477,6 +467,14 @@ class Builder(object):
if not is_err:
success = True
+ self.mockremote.callback.log("Listing built binary packages")
+ self.conn.module_name = "shell"
+ self.conn.module_args = "cd {0} && for f in `ls *.rpm | grep -v
\"src.rpm$\"`; do rpm -qp --qf \"%{{NAME}} %{{VERSION}}\n\" $f;
done".format(self._get_remote_pkg_dir(pkg))
+ results = self.conn.run()
+ build_details["built_packages"] =
results["contacted"].itervalues().next()[u"stdout"]
+
self.mockremote.callback.log("Packages:\n"+build_details["built_packages"])
+
+
return success, out, err, build_details
def download(self, pkg, destdir):