[copr] master: Merge branch 'master' of ssh://git.fedorahosted.org/git/copr (da8c76d)

Repository : http://git.fedorahosted.org/cgit/copr.git

On branch  : master
>

commit da8c76ddaffbb3f7f39811d4454b80a5b3dbab63
Merge: 3693b5d ca05d75
Author: Bohuslav Kabrda 
Date:   Fri Feb 1 14:21:57 2013 +0100

Merge branch 'master' of ssh://git.fedorahosted.org/git/copr
>

backend/dispatcher.py |    6 +++---
 backend/mockremote.py |   11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/backend/dispatcher.py b/backend/dispatcher.py
index 5fa6aa0..610b619 100644
--- a/backend/dispatcher.py
+++ b/backend/dispatcher.py
@@ -174,8 +174,6 @@ class Worker(multiprocessing.Process):
         jobdata.destdir = self.opts.destdir + '/' + build['copr']['owner']['name'] + '/' + build['copr']['name'] + '/'
         jobdata.build_id = build['id']
         jobdata.results = self.opts.results_baseurl + '/' + build['copr']['owner']['name'] + '/' + build['copr']['name'] + '/'
-        # add the results dir to the jobdata.repos
-        jobdata.repos.append(jobdata.results)
         jobdata.copr_id = build['copr']['id']
         jobdata.user_id = build['user_id']
         jobdata.user_name = build['copr']['owner']['name']
@@ -296,10 +294,12 @@ class Worker(multiprocessing.Process):
                 self.callback.log('Starting build: id=%r builder=%r timeout=%r destdir=%r chroot=%r repos=%r' % (job.build_id,ip, job.timeout, job.destdir, chroot, str(job.repos)))
                 self.callback.log('building pkgs: %s' % ' '.join(job.pkgs))
                 try:
+                    chroot_repos = list(job.repos)
+                    chroot_repos.append(job.results + '/' + chroot)
                     chrootlogfile = chroot_destdir + '/build-%s.log' % job.build_id
                     mr = mockremote.MockRemote(builder=ip, timeout=job.timeout, 
                          destdir=job.destdir, chroot=chroot, cont=True, recurse=True,
-                         repos=job.repos, 
+                         repos=chroot_repos,
                          callback=mockremote.CliLogCallBack(quiet=True,logfn=chrootlogfile))
                     mr.build_pkgs(job.pkgs)
                 except mockremote.MockRemoteError, e:
diff --git a/backend/mockremote.py b/backend/mockremote.py
index 2e1e19f..308c21a 100755
--- a/backend/mockremote.py
+++ b/backend/mockremote.py
@@ -511,11 +511,12 @@ class MockRemote(object):
                     self.callback.log("Success building %s" % os.path.basename(pkg))
                     built_pkgs.append(pkg)
                     # createrepo with the new pkgs
-                    rc, out, err = createrepo(self.destdir)
-                    if err.strip():
-                        self.callback.error("Error making local repo: %s" % self.destdir)
-                        self.callback.error("%s" % err)
-                        #FIXME - maybe clean up .repodata and .olddata here?
+                    for d in [self.destdir, self.destdir + '/' + self.chroot]:
+                        rc, out, err = createrepo(d)
+                        if err.strip():
+                            self.callback.error("Error making local repo: %s" % d)
+                            self.callback.error("%s" % err)
+                            #FIXME - maybe clean up .repodata and .olddata here?

if self.failed:
                 if len(self.failed) != len(to_be_built):