Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit 04e43088dc9b7af4eb7e4489a99e161cbcde77a3
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Nov 28 10:47:19 2013 +0100
[frontend] swap vals for succeeded and failed
---------------------------------------------------------------
backend/dispatcher.py | 8 ++++----
coprs_frontend/coprs/helpers.py | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/backend/dispatcher.py b/backend/dispatcher.py
index 8623ed2..e194d8d 100644
--- a/backend/dispatcher.py
+++ b/backend/dispatcher.py
@@ -311,7 +311,7 @@ class Worker(multiprocessing.Process):
except Exception, e:
self.callback.log('failed to initialize fedmsg: %s' % e)
- status = 1
+ status = 1 # succeeded
job.started_on = time.time()
self.mark_started(job)
@@ -334,9 +334,9 @@ class Worker(multiprocessing.Process):
except (OSError, IOError), e:
msg = "Could not make results dir for job: %s - %s" %
(chroot_destdir, str(e))
self.callback.log(msg)
- status = 0
+ status = 0 # fail
- if status == 1:
+ if status == 1: # succeeded
# FIXME
# need a plugin hook or some mechanism to check random
# info about the pkgs
@@ -365,7 +365,7 @@ class Worker(multiprocessing.Process):
# we can't really trace back if we just fail normally
# check if any pkgs didn't build
if mr.failed:
- status = 0
+ status = 0 # failure
self.callback.log('Finished build: id=%r builder=%r timeout=%r
destdir=%r chroot=%r repos=%r' % (job.build_id, ip, job.timeout, job.destdir,
job.chroot, str(job.repos)))
job.ended_on = time.time()
diff --git a/coprs_frontend/coprs/helpers.py b/coprs_frontend/coprs/helpers.py
index f465ba3..0ca22f6 100644
--- a/coprs_frontend/coprs/helpers.py
+++ b/coprs_frontend/coprs/helpers.py
@@ -49,8 +49,8 @@ class RoleEnum(object):
class StatusEnum(object):
__metaclass__ = EnumType
- vals = {'succeeded': 0,
- 'failed': 1,
+ vals = {'failed': 0,
+ 'succeeded': 1,
'canceled': 2,
'running': 3,
'pending': 4}