[copr] master: Merge branch 'master' of ssh://git.fedorahosted.org/git/copr (3a6028b)
bkabrda at fedoraproject.org
bkabrda at fedoraproject.org
Fri Jan 11 10:21:35 UTC 2013
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 3a6028bc8eaae2e5952af141028a45f3e0f901c1
Merge: c6ae28b 48f2824
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date: Fri Jan 11 11:20:19 2013 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/copr
>---------------------------------------------------------------
backend/dispatcher.py | 6 ++++++
backend/mockremote.py | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/backend/dispatcher.py b/backend/dispatcher.py
index 9b0399d..a0115fc 100644
--- a/backend/dispatcher.py
+++ b/backend/dispatcher.py
@@ -288,9 +288,15 @@ class Worker(multiprocessing.Process):
# record and break
self.callback.log('%s - %s' % (ip, e))
status = 0 # failure
+ else:
+ # we can't really trace back if we just fail normally
+ # check if any pkgs didn't build
+ if mr.failed:
+ status = 0
self.callback.log('Finished build: builder=%r timeout=%r destdir=%r chroot=%r repos=%r' % (ip, job.timeout, job.destdir, chroot, str(job.repos)))
job.ended_on = time.time()
+
job.status = status
self.return_results(job)
self.callback.log('worker finished build: %s' % ip)
diff --git a/backend/mockremote.py b/backend/mockremote.py
index 2c641c8..7017a51 100755
--- a/backend/mockremote.py
+++ b/backend/mockremote.py
@@ -57,9 +57,9 @@ class SortedOptParser(optparse.OptionParser):
def createrepo(path):
if os.path.exists(path + '/repodata/repomd.xml'):
- comm = ['/usr/bin/createrepo', '--update', path]
+ comm = ['/usr/bin/createrepo', '--database', '--update', path]
else:
- comm = ['/usr/bin/createrepo', path]
+ comm = ['/usr/bin/createrepo', '--database', path]
cmd = subprocess.Popen(comm,
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out, err = cmd.communicate()
More information about the copr-devel
mailing list