copr-commits April 2014

copr-commits@lists.fedorahosted.org

2 participants
52 discussions

[copr] master: add newline at the end of repo file (e722677)
by Miroslav Suchý 30 Apr '14

30 Apr '14

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit e722677dc74f28982cb4fefd55d38d16adc428e7 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Apr 30 14:53:48 2014 +0200 add newline at the end of repo file so it looks nice when you cat it >--------------------------------------------------------------- .../coprs_frontend/coprs/templates/coprs/copr.repo | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/frontend/coprs_frontend/coprs/templates/coprs/copr.repo b/frontend/coprs_frontend/coprs/templates/coprs/copr.repo index 1aaf318..a2707fe 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/copr.repo +++ b/frontend/coprs_frontend/coprs/templates/coprs/copr.repo @@ -4,3 +4,4 @@ baseurl={{ url }} skip_if_unavailable=True gpgcheck=0 enabled=1 +

1 0

[copr] master: add newline at the end of repo file (157e0cf)
by Miroslav Suchý 30 Apr '14

30 Apr '14

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 157e0cf03f5032313a917596520de5b3658cebc3 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Apr 30 14:50:47 2014 +0200 add newline at the end of repo file so it looks nice when you cat it >---------------------------------------------------------------

1 0

[copr] master: [cli] exit code 4 for failed build and man pages updated (7d16d7c)
by asamalik＠fedoraproject.org 29 Apr '14

29 Apr '14

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 7d16d7c2e43f0d5fd3d01bda91ddedbe52f0bdef Author: Adam Samalik <asamalik(a)redhat.com> Date: Tue Apr 29 15:04:32 2014 +0200 [cli] exit code 4 for failed build and man pages updated >--------------------------------------------------------------- cli/copr_cli/copr_exceptions.py | 9 ++++++++- cli/copr_cli/main.py | 3 +++ cli/copr_cli/subcommands.py | 2 +- cli/man/copr-cli.1.asciidoc | 11 +++++++++++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/cli/copr_cli/copr_exceptions.py b/cli/copr_cli/copr_exceptions.py index 4be2f06..1e10678 100644 --- a/cli/copr_cli/copr_exceptions.py +++ b/cli/copr_cli/copr_exceptions.py @@ -26,12 +26,19 @@ class CoprCliConfigException(CoprCliException): class CoprCliRequestException(Exception): - """ Exception thrown when server says no. For example, + """ Exception thrown when the request is bad. For example, the user provided wrong project name or build ID. """ pass +class CoprCliBuildException(Exception): + """ Exception thrown when one or more builds fail and Cli is waiting + for the result. + """ + pass + + class CoprCliUnknownResponseException(Exception): """ Exception thrown when the response is unknown to cli. It usualy means that something is broken. diff --git a/cli/copr_cli/main.py b/cli/copr_cli/main.py index 477ac0e..597b57a 100644 --- a/cli/copr_cli/main.py +++ b/cli/copr_cli/main.py @@ -172,6 +172,9 @@ def main(argv=sys.argv[1:]): except ConfigParser.ParsingError, e: sys.stderr.write("\nError: {0}\n".format(e)) sys.stderr.write("Lines in INI file should not be indented.\n") + sys.exit(3) + except copr_exceptions.CoprCliBuildException, e: + sys.stderr.write("\nBuild error: {0}\n".format(e)) sys.exit(4) except copr_exceptions.CoprCliUnknownResponseException, e: sys.stderr.write("\nError: {0}\n".format(e)) diff --git a/cli/copr_cli/subcommands.py b/cli/copr_cli/subcommands.py index 113a8bd..7f2215b 100644 --- a/cli/copr_cli/subcommands.py +++ b/cli/copr_cli/subcommands.py @@ -295,7 +295,7 @@ def build(copr, pkgs, memory, timeout, wait=True, result=None, chroots=None): time.sleep(60) if failed_ids: - raise copr_exceptions.CoprCliRequestException( + raise copr_exceptions.CoprCliBuildException( "Build(s) {0} failed.".format( ", ".join(str(x) for x in failed_ids))) diff --git a/cli/man/copr-cli.1.asciidoc b/cli/man/copr-cli.1.asciidoc index ef9ada9..b748ab9 100644 --- a/cli/man/copr-cli.1.asciidoc +++ b/cli/man/copr-cli.1.asciidoc @@ -101,6 +101,17 @@ pkg_url:: URL of the package to build. The package must be placed on a public web or ftp server. +EXIT STATUS +----------- +Normally, the exit code is 0 when everything goes well. But if not, we could get: +1 - Bad request like wrong project name, insufficient rights etc. + Also might happen when user interrupts the operation when they shouldn't. +2 - Wrong arguments given. +3 - Bad or no configuration. +4 - Build fails when Cli is waiting for the result. +5 - Communication error between Cli and server. + This issue probably means bug and should be reported. + API KEY -------

1 0

[copr] master: [cli] error and shell return code 1 when build fails (ed3c26e)
by asamalik＠fedoraproject.org 29 Apr '14

29 Apr '14

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit ed3c26e5bf8842139b7dce954c0d764c9c42aaa9 Author: Adam Samalik <asamalik(a)redhat.com> Date: Tue Apr 29 13:09:05 2014 +0200 [cli] error and shell return code 1 when build fails >--------------------------------------------------------------- cli/copr_cli/subcommands.py | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/cli/copr_cli/subcommands.py b/cli/copr_cli/subcommands.py index 15c9ebd..113a8bd 100644 --- a/cli/copr_cli/subcommands.py +++ b/cli/copr_cli/subcommands.py @@ -43,6 +43,10 @@ def _get_data(req, user, copr=None): "Unknown response from the server.") if req.status_code != 200: raise copr_exceptions.CoprCliRequestException(output["error"]) + + if output is None: + raise copr_exceptions.CoprCliUnknownResponseException( + "No response from the server.") return output @@ -254,15 +258,12 @@ def build(copr, pkgs, memory, timeout, wait=True, result=None, chroots=None): auth=(user["login"], user["token"]), data=data) output = _get_data(req, user, copr) - if output is None: - return - else: - print(output["message"]) + print("{1}:\n {0} build(s) were added successfully\n".format(len(output["ids"]), copr)) if wait: - print("{0} builds were added.".format(len(output["ids"]))) - print("Watching builds (this may be safely interrupted)...") + print("Watching build(s): (this may be safely interrupted)") prevstatus = {} + failed_ids = [] for id in output["ids"]: prevstatus[id] = None if result is not None: @@ -272,28 +273,31 @@ def build(copr, pkgs, memory, timeout, wait=True, result=None, chroots=None): for id in output["ids"]: (ret, status) = _fetch_status(id) if not ret: - errmsg = "Build {1}: Unable to get build status: {0}".format(status,id) - print errmsg + errmsg = " Build {1}: Unable to get build status: {0}".format(status,id) if result is not None: result[id]['errmsg'] = errmsg - return False + raise copr_exceptions.CoprCliRequestException(errmsg) now = datetime.datetime.now() if prevstatus[id] != status: - print("{0} Build {2}: {1}".format(now.strftime("%H:%M:%S"), status, id)) + print(" {0} Build {2}: {1}".format(now.strftime("%H:%M:%S"), status, id)) prevstatus[id] = status if status in ["succeeded", "failed", "canceled"]: if result is not None: result[id]['status'] = status + if status in ["failed"]: + failed_ids.append(id) output["ids"].remove(id) if not output["ids"]: - return True - + break time.sleep(60) + if failed_ids: + raise copr_exceptions.CoprCliRequestException( + "Build(s) {0} failed.".format( + ", ".join(str(x) for x in failed_ids))) + except KeyboardInterrupt: pass - - return True

1 0

[copr] master: [cli & api] delete a project (0fe4640)
by asamalik＠fedoraproject.org 24 Apr '14

24 Apr '14

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 0fe4640234f7e1b24a6de09cc23e6f11ab6cea25 Author: Adam Samalik <asamalik(a)redhat.com> Date: Thu Apr 24 10:29:20 2014 +0200 [cli & api] delete a project >--------------------------------------------------------------- cli/copr_cli/main.py | 15 +++++++++ cli/copr_cli/subcommands.py | 20 +++++++++++ cli/man/copr-cli.1.asciidoc | 5 ++- frontend/coprs_frontend/coprs/templates/api.html | 18 ++++++++++ .../coprs/views/api_ns/api_general.py | 34 ++++++++++++++++++++ 5 files changed, 91 insertions(+), 1 deletions(-) diff --git a/cli/copr_cli/main.py b/cli/copr_cli/main.py index 50d8a06..477ac0e 100644 --- a/cli/copr_cli/main.py +++ b/cli/copr_cli/main.py @@ -33,6 +33,14 @@ def action_create(args): args.instructions, args.repos, args.initial_pkgs) +def action_delete(args): + """ Method called when the 'delete' action has been selected by the + user. + + :param args: argparse arguments provided by the user + """ + subcommands.delete(args.copr) + def action_list(args): """ Method called when the 'list' action has been selected by the @@ -97,6 +105,13 @@ def setup_parser(): help="Instructions for the copr") parser_create.set_defaults(func=action_create) + # create the parser for the "delete" command + parser_delete = subparsers.add_parser("delete", + help="Deletes the entire project") + parser_delete.add_argument("copr", + help="Name of your project to be deleted.") + parser_delete.set_defaults(func=action_delete) + # create the parser for the "build" command parser_build = subparsers.add_parser("build", help="Build packages to a " diff --git a/cli/copr_cli/subcommands.py b/cli/copr_cli/subcommands.py index 2a74ea0..15c9ebd 100644 --- a/cli/copr_cli/subcommands.py +++ b/cli/copr_cli/subcommands.py @@ -161,6 +161,26 @@ def create(name, chroots=[], description=None, instructions=None, print(output["message"]) +def delete(copr): + """ Delete the entire project. + """ + user = get_user() + username = user["username"] + + copr_api_url = get_api_url() + URL = "{0}/coprs/{1}/{2}/delete/".format( + copr_api_url, + username, + copr) + + data = {"verify": "yes"} + + req = requests.post(URL, + auth=(user["login"], user["token"]), + data=data) + output = _get_data(req, user, copr) + + def _fetch_status(build_id): user = get_user() copr_api_url = get_api_url() diff --git a/cli/man/copr-cli.1.asciidoc b/cli/man/copr-cli.1.asciidoc index 518b456..ef9ada9 100644 --- a/cli/man/copr-cli.1.asciidoc +++ b/cli/man/copr-cli.1.asciidoc @@ -38,7 +38,10 @@ then your projects are listed. create:: Create a new project. -build :: +delete:: +Delete an entire project. + +build:: Build packages for a specified project. status:: diff --git a/frontend/coprs_frontend/coprs/templates/api.html b/frontend/coprs_frontend/coprs/templates/api.html index 66f7f48..df37ec0 100644 --- a/frontend/coprs_frontend/coprs/templates/api.html +++ b/frontend/coprs_frontend/coprs/templates/api.html @@ -174,6 +174,24 @@ copr_url = http://copr.fedoraproject.org packages to build in this new project</li> </ul> + <h3>Delete an entire project</h3> + + <p><span style="font-style:italic">Login required</span></p> + + <h4>URL:</h4> + <pre style="font-size:120%">/api/coprs/<username>/<projectname>/delete/</pre> + + <h4>URL parameters:</h4> + <ul> + <li><b>username</b> – Your username </li> + <li><b>projectname</b> – Name of the project you want to delete.</li> + </ul> + + <h4>Parameters sent by POST:</h4> + <ul> + <li><b>verify</b> – This needs to be "yes"</li> + </ul> + <h3>Add new build</h3> <p><span style="font-style:italic">Login required</span></p> diff --git a/frontend/coprs_frontend/coprs/views/api_ns/api_general.py b/frontend/coprs_frontend/coprs/views/api_ns/api_general.py index b3bcd7b..4de29bb 100644 --- a/frontend/coprs_frontend/coprs/views/api_ns/api_general.py +++ b/frontend/coprs_frontend/coprs/views/api_ns/api_general.py @@ -122,6 +122,40 @@ def api_new_copr(username): return jsonout +(a)api_ns.route("/coprs/<username>/<coprname>/delete/", methods=["POST"]) +@api_login_required +def api_copr_delete(username, coprname): + """ Deletes selected user's project + """ + form = forms.CoprDeleteForm(csrf_enabled=False) + copr = coprs_logic.CoprsLogic.get(flask.g.user, username, coprname).first() + httpcode = 200 + + if form.validate_on_submit() and copr: + builds_query = builds_logic.BuildsLogic.get_multiple( + flask.g.user, copr=copr) + try: + for build in builds_query: + builds_logic.BuildsLogic.delete_build(flask.g.user, build) + coprs_logic.CoprsLogic.delete(flask.g.user, copr) + except (exceptions.ActionInProgressException, + exceptions.InsufficientRightsException) as err: + output = {"output": "notok", "error": err} + httpcode = 500 + db.session.rollback() + else: + message = "Project {0} has been deleted.".format(coprname) + output = {"output": "ok", "message": message} + db.session.commit() + else: + output = {"output": "notok", "error": "Invalid request"} + httpcode = 500 + + jsonout = flask.jsonify(output) + jsonout.status_code = httpcode + return jsonout + + @api_ns.route("/coprs/") @api_ns.route("/coprs/<username>/") def api_coprs_by_owner(username=None):

1 0

[copr] tag 'copr-backend-1.34-1' created
by Miroslav Suchý 24 Apr '14

24 Apr '14

Repository : http://git.fedorahosted.org/cgit/copr.git New tag : copr-backend-1.34-1 Referencing: 83b51d58106cc3804ced58a81b775f731b673eeb

1 0

[copr] master: Automatic commit of package [copr-backend] release [1.34-1]. (06eab00)
by Miroslav Suchý 24 Apr '14

24 Apr '14

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 06eab00166551f72b5569427bad9fe13c0d4f944 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Thu Apr 24 10:52:20 2014 +0200 Automatic commit of package [copr-backend] release [1.34-1]. >--------------------------------------------------------------- backend/copr-backend.spec | 5 ++++- rel-eng/packages/copr-backend | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/backend/copr-backend.spec b/backend/copr-backend.spec index a353e9f..86d1885 100644 --- a/backend/copr-backend.spec +++ b/backend/copr-backend.spec @@ -3,7 +3,7 @@ %endif Name: copr-backend -Version: 1.33 +Version: 1.34 Release: 1%{?dist} Summary: Backend for Copr @@ -170,6 +170,9 @@ useradd -r -g copr -G lighttpd -s /bin/bash -c "COPR user" copr %exclude %{_pkgdocdir}/playbooks %changelog +* Thu Apr 24 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.34-1 +- if directory does not exist, do not try to delete it + * Tue Apr 15 2014 Miroslav Suchý <miroslav(a)suchy.cz> 1.33-1 - do not publish copr.worker messages - better count workers diff --git a/rel-eng/packages/copr-backend b/rel-eng/packages/copr-backend index 2f1e26d..42ca318 100644 --- a/rel-eng/packages/copr-backend +++ b/rel-eng/packages/copr-backend @@ -1 +1 @@ -1.33-1 backend/ +1.34-1 backend/

1 0

[copr] tag 'copr-frontend-1.34-1' created
by Miroslav Suchý 24 Apr '14

24 Apr '14

Repository : http://git.fedorahosted.org/cgit/copr.git New tag : copr-frontend-1.34-1 Referencing: 93eec63723dfe0ed6620a93c16f915dd662f0acb

1 0

[copr] master: Automatic commit of package [copr-frontend] release [1.34-1]. (a735e53)
by Miroslav Suchý 24 Apr '14

24 Apr '14

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit a735e53741913529e7743722761333436fc6f86a Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Thu Apr 24 10:51:48 2014 +0200 Automatic commit of package [copr-frontend] release [1.34-1]. >--------------------------------------------------------------- frontend/copr-frontend.spec | 9 ++++++++- rel-eng/packages/copr-frontend | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/frontend/copr-frontend.spec b/frontend/copr-frontend.spec index c86900e..0debbd0 100644 --- a/frontend/copr-frontend.spec +++ b/frontend/copr-frontend.spec @@ -5,7 +5,7 @@ %endif Name: copr-frontend -Version: 1.33 +Version: 1.34 Release: 1%{?dist} Summary: Frontend for Copr @@ -160,6 +160,13 @@ service httpd condrestart %doc %{_pkgdocdir}/python-doc %changelog +* Thu Apr 24 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.34-1 +- add indexes +- 1086729 - make build tab friendly for users without JS +- copr-cli cancel fix +- correctly print chroots +- [frontend] SEND_EMAILS config correction + * Tue Apr 15 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.33-1 - api: add chroots to playground api call - check if chroot exist for specified project diff --git a/rel-eng/packages/copr-frontend b/rel-eng/packages/copr-frontend index 928fe6b..69f3eee 100644 --- a/rel-eng/packages/copr-frontend +++ b/rel-eng/packages/copr-frontend @@ -1 +1 @@ -1.33-1 frontend/ +1.34-1 frontend/

1 0

[copr] master: if directory does not exist, do not try to delete it (60b162d)
by Miroslav Suchý 24 Apr '14

24 Apr '14

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 60b162dd18b1f56d09b3956a3a64db04a927ee02 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Apr 23 17:16:09 2014 +0200 if directory does not exist, do not try to delete it addressing: Process jobgrab: Traceback (most recent call last): File "/usr/lib64/python2.7/multiprocessing/process.py", line 258, in _bootstrap self.run() File "/usr/share/copr/copr-be.py", line 104, in run self.fetch_jobs() File "/usr/share/copr/copr-be.py", line 97, in fetch_jobs ao.run() File "/usr/share/copr/backend/actions.py", line 51, in run for chroot in os.listdir(path): OSError: [Errno 2] No such file or directory: '/var/lib/copr/public_html/results/asamalik/test-project' >--------------------------------------------------------------- backend/backend/actions.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/backend/backend/actions.py b/backend/backend/actions.py index 63dafed..db4ae7b 100644 --- a/backend/backend/actions.py +++ b/backend/backend/actions.py @@ -48,7 +48,12 @@ class Action(object): self.event("Packages to delete {0}".format(' '.join(packages))) self.event("Copr path {0}".format(path)) - for chroot in os.listdir(path): + try: + chroot_list = os.listdir(path) + except OSError: + # already deleted + chroot_list = [] + for chroot in chroot_list: self.event("In chroot {0}".format(chroot)) altered = False

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

copr-commits April 2014