Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
commit d94281256a89f005c09eb3ca17d41ab2326a2a7c Author: Miroslav Suchý miroslav@suchy.cz Date: Tue Jan 14 16:58:04 2014 +0100
[frontend] correctly handle mangled chroot
as in previous 2 commits
.../coprs/views/coprs_ns/coprs_chroots.py | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_chroots.py b/coprs_frontend/coprs/views/coprs_ns/coprs_chroots.py index 45baf4a..6dac9e4 100644 --- a/coprs_frontend/coprs/views/coprs_ns/coprs_chroots.py +++ b/coprs_frontend/coprs/views/coprs_ns/coprs_chroots.py @@ -17,9 +17,12 @@ from coprs.views.coprs_ns import coprs_ns @login_required def chroot_edit(username, coprname, chrootname): copr = coprs_logic.CoprsLogic.get(flask.g.user, username, coprname).first() - chroot = coprs_logic.MockChrootsLogic.get_from_name(chrootname, active_only=True).first() if not copr: return page_not_found('Project with name {0} does not exist.'.format(coprname)) + try: + chroot = coprs_logic.MockChrootsLogic.get_from_name(chrootname, active_only=True).first() + except ValueError, e: + return page_not_found("%s" % e) if not chroot: return page_not_found('Chroot name {0} does not exist.'.format(chrootname)) form = forms.ChrootForm(buildroot_pkgs=copr.buildroot_pkgs(chroot)) @@ -34,9 +37,12 @@ def chroot_edit(username, coprname, chrootname): def chroot_update(username, coprname, chrootname): form = forms.ChrootForm() copr = coprs_logic.CoprsLogic.get(flask.g.user, username, coprname).first() - chroot = coprs_logic.MockChrootsLogic.get_from_name(chrootname, active_only=True).first() - if not copr: # hey, this Copr doesn't exist + if not copr: return page_not_found('Projec with name {0} does not exist.'.format(coprname)) + try: + chroot = coprs_logic.MockChrootsLogic.get_from_name(chrootname, active_only=True).first() + except ValueError, e: + return page_not_found("%s" % e) if form.validate_on_submit() and flask.g.user.can_build_in(copr): coprs_logic.CoprChrootsLogic.update_buildroot_pkgs(copr, chroot, form.buildroot_pkgs.data) flask.flash("Buildroot {0} for project {1} was updated".format(chrootname, coprname))
copr-commits@lists.fedorahosted.org