[copr] master: Automatic commit of package [copr] release [1.18-1]. (05359b9)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 05359b913a12ff7d062d04d8ed90f8cc00923fb7
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 11 18:21:16 2013 +0100
Automatic commit of package [copr] release [1.18-1].
>---------------------------------------------------------------
copr.spec | 5 ++++-
rel-eng/packages/copr | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/copr.spec b/copr.spec
index 335fa6c..11f87b4 100644
--- a/copr.spec
+++ b/copr.spec
@@ -6,7 +6,7 @@
%global modulename copr
Name: copr
-Version: 1.17
+Version: 1.18
Release: 1%{?dist}
Summary: Cool Other Package Repo
@@ -383,6 +383,9 @@ fi
%{_mandir}/man8/%{name}-selinux-relabel.8*
%changelog
+* Wed Dec 11 2013 Miroslav Suchý <msuchy(a)redhat.com> 1.18-1
+- [frontend] inicialize variable
+
* Wed Dec 11 2013 Miroslav Suchý <msuchy(a)redhat.com> 1.17-1
- [frontend] fix latest build variable overwrite
diff --git a/rel-eng/packages/copr b/rel-eng/packages/copr
index 8582692..60526d6 100644
--- a/rel-eng/packages/copr
+++ b/rel-eng/packages/copr
@@ -1 +1 @@
-1.17-1 ./
+1.18-1 ./
10 years, 5 months
[copr] master: [frontend] inicialize variable (c959f28)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit c959f28a332b4854ead26d8b4e5732d88f3fb57f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 11 18:20:43 2013 +0100
[frontend] inicialize variable
addressing:
Traceback (most recent call last):
File "/usr/lib/python2.7/site-packages/flask/app.py", line 1687, in wsgi_app
response = self.full_dispatch_request()
File "/usr/lib/python2.7/site-packages/flask/app.py", line 1360, in full_dispatch_request
rv = self.handle_user_exception(e)
File "/usr/lib/python2.7/site-packages/flask/app.py", line 1358, in full_dispatch_request
rv = self.dispatch_request()
File "/usr/lib/python2.7/site-packages/flask/app.py", line 1344, in dispatch_request
return self.view_functions[rule.endpoint](**req.view_args)
File "/usr/share/copr/coprs_frontend/coprs/views/coprs_ns/coprs_general.py", line 401, in copr_build_monitor
build=latest_build,
UnboundLocalError: local variable 'latest_build' referenced before assignment
>---------------------------------------------------------------
.../coprs/views/coprs_ns/coprs_general.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
index 4794dbf..03898fc 100644
--- a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
+++ b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
@@ -371,6 +371,7 @@ def copr_build_monitor(username, coprname):
out = {}
build = None
chroots = []
+ latest_build = None
if builds:
latest_build = builds[0]
10 years, 5 months
[copr] master: Automatic commit of package [copr] release [1.17-1]. (b88d892)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit b88d892203ef15cbe01ef920263e48e3d6b1daf1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 11 17:59:55 2013 +0100
Automatic commit of package [copr] release [1.17-1].
>---------------------------------------------------------------
copr.spec | 5 ++++-
rel-eng/packages/copr | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/copr.spec b/copr.spec
index 7dd559d..335fa6c 100644
--- a/copr.spec
+++ b/copr.spec
@@ -6,7 +6,7 @@
%global modulename copr
Name: copr
-Version: 1.16
+Version: 1.17
Release: 1%{?dist}
Summary: Cool Other Package Repo
@@ -383,6 +383,9 @@ fi
%{_mandir}/man8/%{name}-selinux-relabel.8*
%changelog
+* Wed Dec 11 2013 Miroslav Suchý <msuchy(a)redhat.com> 1.17-1
+- [frontend] fix latest build variable overwrite
+
* Wed Dec 11 2013 Miroslav Suchý <msuchy(a)redhat.com> 1.16-1
- [backend] store jobs in id-chroot.json file
- [frontend] handle unknown build/chroot status
diff --git a/rel-eng/packages/copr b/rel-eng/packages/copr
index 3ae4420..8582692 100644
--- a/rel-eng/packages/copr
+++ b/rel-eng/packages/copr
@@ -1 +1 @@
-1.16-1 ./
+1.17-1 ./
10 years, 5 months
[copr] master: [frontend] fix latest build variable overwrite (c01b89c)
by Richard Marko
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit c01b89cde292d9fa30b93696279d58bbf3afac49
Author: Richard Marko <rmarko(a)fedoraproject.org>
Date: Wed Dec 11 17:19:32 2013 +0100
[frontend] fix latest build variable overwrite
Signed-off-by: Richard Marko <rmarko(a)fedoraproject.org>
>---------------------------------------------------------------
.../coprs/views/coprs_ns/coprs_general.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
index 8d96c32..4794dbf 100644
--- a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
+++ b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
@@ -373,8 +373,8 @@ def copr_build_monitor(username, coprname):
chroots = []
if builds:
- build = builds[0] # latest build
- chroots = sorted([chroot.name for chroot in build.build_chroots])
+ latest_build = builds[0]
+ chroots = sorted([chroot.name for chroot in latest_build.build_chroots])
for build in builds:
chroot_results = {chroot.name: chroot.state
@@ -398,7 +398,7 @@ def copr_build_monitor(username, coprname):
return flask.render_template('coprs/detail/monitor.html',
copr=copr,
- build=build,
+ build=latest_build,
chroots=chroots,
packages=sorted(out.iteritems()),
form=form)
10 years, 5 months
[copr] master: Automatic commit of package [copr] release [1.16-1]. (91a9bde)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 91a9bdee1eaacafab9143a4f733c2c8717f55fdb
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 11 17:22:53 2013 +0100
Automatic commit of package [copr] release [1.16-1].
>---------------------------------------------------------------
copr.spec | 7 ++++++-
rel-eng/packages/copr | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/copr.spec b/copr.spec
index f0a68ca..7dd559d 100644
--- a/copr.spec
+++ b/copr.spec
@@ -6,7 +6,7 @@
%global modulename copr
Name: copr
-Version: 1.15
+Version: 1.16
Release: 1%{?dist}
Summary: Cool Other Package Repo
@@ -383,6 +383,11 @@ fi
%{_mandir}/man8/%{name}-selinux-relabel.8*
%changelog
+* Wed Dec 11 2013 Miroslav Suchý <msuchy(a)redhat.com> 1.16-1
+- [backend] store jobs in id-chroot.json file
+- [frontend] handle unknown build/chroot status
+- use newstyle ansible variables
+
* Tue Dec 10 2013 Miroslav Suchý <msuchy(a)redhat.com> 1.15-1
- [frontend] smarter package name parsing
- [frontend] extend range to allow 0
diff --git a/rel-eng/packages/copr b/rel-eng/packages/copr
index 21094c0..3ae4420 100644
--- a/rel-eng/packages/copr
+++ b/rel-eng/packages/copr
@@ -1 +1 @@
-1.15-1 ./
+1.16-1 ./
10 years, 5 months
[copr] master: [backend] remove of dead code (db54c75)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit db54c7578afbf61470dd3c66573fa7582966afb3
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 11 14:05:26 2013 +0100
[backend] remove of dead code
>---------------------------------------------------------------
copr-be.py | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/copr-be.py b/copr-be.py
index fa934a7..4d3cb68 100755
--- a/copr-be.py
+++ b/copr-be.py
@@ -165,8 +165,6 @@ class CoprBackend(object):
os.makedirs(self.opts.worker_logdir, mode=0750)
self.workers = []
- self.added_jobs = []
- self.abort = False
def event(self, what):
self.events.put({'when':time.time(), 'who':'main', 'what':what})
10 years, 5 months
[copr] master: [backend] store jobs in id-chroot.json file (393e43c)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 393e43c519be668d998f1a9629b8889ec546a527
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 11 14:04:09 2013 +0100
[backend] store jobs in id-chroot.json file
to prevent overwritten by another task of the same id but different chroot
>---------------------------------------------------------------
copr-be.py | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/copr-be.py b/copr-be.py
index ce94460..fa934a7 100755
--- a/copr-be.py
+++ b/copr-be.py
@@ -61,11 +61,12 @@ class CoprJobGrab(multiprocessing.Process):
count = 0
for b in r_json['builds']:
if 'id' in b:
- jobfile = self.opts.jobsdir + '/%s.json' % b['id']
- if not os.path.exists(jobfile) and b['id'] not in self.added_jobs:
+ extended_id = "%s-%s" % (b['id'], b['chroot'])
+ jobfile = self.opts.jobsdir + '/%s.json' % extended_id
+ if not os.path.exists(jobfile) and extended_id not in self.added_jobs:
count += 1
open(jobfile, 'w').write(json.dumps(b))
- self.event('Wrote job: %s' % b['id'])
+ self.event('Wrote job: %s' % extended_id)
if count:
self.event('New jobs: %s' % count)
if 'actions' in r_json and r_json['actions']:
10 years, 5 months
[copr] master: [frontend] handle unknown build/chroot status (89432f5)
by Richard Marko
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 89432f58eee817e4b2dff057e3a382a8ba8397c4
Author: Richard Marko <rmarko(a)fedoraproject.org>
Date: Wed Dec 11 16:06:09 2013 +0100
[frontend] handle unknown build/chroot status
Signed-off-by: Richard Marko <rmarko(a)fedoraproject.org>
>---------------------------------------------------------------
coprs_frontend/coprs/models.py | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/coprs_frontend/coprs/models.py b/coprs_frontend/coprs/models.py
index e7881c0..8093a05 100644
--- a/coprs_frontend/coprs/models.py
+++ b/coprs_frontend/coprs/models.py
@@ -266,7 +266,10 @@ class Build(db.Model, Serializer):
@property
def state(self):
""" Return text representation of status of this build """
- return helpers.StatusEnum(self.status)
+ if self.status is not None:
+ return helpers.StatusEnum(self.status)
+
+ return 'unknown'
@property
def cancelable(self):
@@ -330,7 +333,10 @@ class BuildChroot(db.Model, Serializer):
@property
def state(self):
""" Return text representation of status of this build chroot """
- return helpers.StatusEnum(self.status)
+ if self.status is not None:
+ return helpers.StatusEnum(self.status)
+
+ return 'unknown'
10 years, 5 months