June 2014 - copr-commits - Fedora Mailing-Lists

[copr] master: C:116, 0: Unnecessary parens after 'print' keyword (superfluous-parens) (2df1712)

by Miroslav Suchý

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 2df17128f165f1b92b109aa8a73fbf5cf490016c Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Jun 9 18:13:44 2014 +0200 C:116, 0: Unnecessary parens after 'print' keyword (superfluous-parens) >--------------------------------------------------------------- backend/backend/mockremote.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/backend/backend/mockremote.py b/backend/backend/mockremote.py index 5b9e409..d1826c5 100755 --- a/backend/backend/mockremote.py +++ b/backend/backend/mockremote.py @@ -24,6 +24,7 @@ # repeat # take args from mockchain (more or less) +from __future__ import print_function import os import sys

9 years, 11 months

1
0
0 / 0

[copr] master: W: 72, 28: Unused variable 'out' (unused-variable) W: 72, 24: Unused variable 'rc' (unused-variable) (9f65758)

by Miroslav Suchý

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 9f657584e95a8b236251311b45816c08ded97664 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Jun 9 18:06:54 2014 +0200 W: 72,28: Unused variable 'out' (unused-variable) W: 72,24: Unused variable 'rc' (unused-variable) >--------------------------------------------------------------- backend/backend/actions.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/backend/backend/actions.py b/backend/backend/actions.py index db4ae7b..180e778 100644 --- a/backend/backend/actions.py +++ b/backend/backend/actions.py @@ -69,7 +69,7 @@ class Action(object): if altered: self.event("Running createrepo") - rc, out, err = createrepo(os.path.join(path, chroot), self.lock) + _, _, err = createrepo(os.path.join(path, chroot), self.lock) if err.strip(): self.event( "Error making local repo: {0}".format(err))

9 years, 11 months

1
0
0 / 0

[copr] master: [frontend] repofiles without specifying architecture (32bb20f)

by asamalik＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 32bb20f0132ba186517a0bbe4250ce8a34d211e5 Author: Adam Samalik <asamalik(a)redhat.com> Date: Mon Jun 9 16:45:55 2014 +0200 [frontend] repofiles without specifying architecture >--------------------------------------------------------------- frontend/coprs_frontend/coprs/logic/coprs_logic.py | 44 ++++++++++++-------- frontend/coprs_frontend/coprs/models.py | 20 +++------ .../coprs/templates/coprs/detail/overview.html | 6 +- .../coprs/views/coprs_ns/coprs_general.py | 13 +---- 4 files changed, 38 insertions(+), 45 deletions(-) diff --git a/frontend/coprs_frontend/coprs/logic/coprs_logic.py b/frontend/coprs_frontend/coprs/logic/coprs_logic.py index 1bc8be4..54efefe 100644 --- a/frontend/coprs_frontend/coprs/logic/coprs_logic.py +++ b/frontend/coprs_frontend/coprs/logic/coprs_logic.py @@ -365,21 +365,29 @@ class CoprChrootsLogic(object): class MockChrootsLogic(object): @classmethod - def get(cls, user, os_release, os_version, arch, active_only=False): + def get(cls, user, os_release, os_version, arch, active_only=False, noarch=False): + if noarch and not arch: + return (models.MockChroot.query + .filter(models.MockChroot.os_release == os_release, + models.MockChroot.os_version == os_version)) + return (models.MockChroot.query .filter(models.MockChroot.os_release == os_release, models.MockChroot.os_version == os_version, models.MockChroot.arch == arch)) @classmethod - def get_from_name(cls, chroot_name, active_only=False): + def get_from_name(cls, chroot_name, active_only=False, noarch=False): """ + chroot_name should be os-version-architecture, e.g. fedora-rawhide-x86_64 + the architecture could be optional with noarch=True + Return MockChroot object for textual representation of chroot """ - name_tuple = cls.tuple_from_name(None, chroot_name) - return cls.get(None, name_tuple[0], name_tuple[1], - name_tuple[2], active_only=active_only) + name_tuple = cls.tuple_from_name(None, chroot_name, noarch=noarch) + return cls.get(None, name_tuple[0], name_tuple[1], name_tuple[2], + active_only=active_only, noarch=noarch) @classmethod def get_multiple(cls, user, active_only=False): @@ -435,21 +443,21 @@ class MockChrootsLogic(object): db.session.delete(mock_chroot) @classmethod - def tuple_from_name(cls, user, name): - """ - valid name can be "fedora-rawhide-x86_64" or even "fedora-rawhide" + def tuple_from_name(cls, user, name, noarch=False): """ + input should be os-version-architecture, e.g. fedora-rawhide-x86_64 - split_name = name.rsplit('-', 1) - if len(split_name) < 2: + the architecture could be optional with noarch=True + + returns ("os", "vetsion", "arch") or ("os", "version", None) + """ + splitted_name = name.split("-") + if (not noarch and len(splitted_name) is not 3)\ + or (noarch and len(splitted_name) not in (2,3)): raise exceptions.MalformedArgumentException( - "Chroot Name doesn't contain dash," - " can't determine chroot architecure.") + "Chroot name is not valid") - if '-' in split_name[0]: - os_release, os_version = (split_name[0].rsplit('-'))[0:2] - else: - os_release, os_version = split_name[0], '' + if noarch: + splitted_name.append(None) - arch = split_name[1] - return (os_release, os_version, arch) + return tuple(splitted_name) diff --git a/frontend/coprs_frontend/coprs/models.py b/frontend/coprs_frontend/coprs/models.py index 519aac6..5b71fff 100644 --- a/frontend/coprs_frontend/coprs/models.py +++ b/frontend/coprs_frontend/coprs/models.py @@ -320,23 +320,15 @@ class MockChroot(db.Model, helpers.Serializer): """ Textual representation of name of this chroot """ - - if self.os_version: - format_string = "{rel}-{ver}-{arch}" - else: - format_string = "{rel}-{arch}" - return format_string.format(rel=self.os_release, - ver=self.os_version, - arch=self.arch) + return "{0}-{1}-{2}".format( + self.os_release, self.os_version, self.arch) @property def os(self): - if self.os_version: - format_string = "{rel} {ver}" - else: - format_string = "{rel}" - return format_string.format(rel=self.os_release, - ver=self.os_version) + """ + Textual representation of the operating system name + """ + return "{0} {1}".format(self.os_release, self.os_version) diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/overview.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/overview.html index 2eb5c88..5dd2c41 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/detail/overview.html +++ b/frontend/coprs_frontend/coprs/templates/coprs/detail/overview.html @@ -51,9 +51,9 @@ 'coprs_ns.generate_repo_file', username=copr.owner.name, coprname=copr.name, - chroot=mock_chroot.name, - repofile=copr.owner.name+'-'+copr.name+'-'+mock_chroot.name+'.repo') }}"> - {{ copr.owner.name }}-{{ copr.name }}-{{mock_chroot.name}}.repo</a></td> + chroot=mock_chroot.os_release+"-"+mock_chroot.os_version, + repofile=copr.owner.name+'-'+copr.name+'-'+mock_chroot.os_release+"-"+mock_chroot.os_version+'.repo') }}"> + {{ copr.owner.name }}-{{ copr.name }}-{{mock_chroot.os_release+"-"+mock_chroot.os_version}}.repo</a></td> {% else %} <td></td> {% endif %} diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py index f51f7e1..3646305 100644 --- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py +++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py @@ -477,11 +477,6 @@ def generate_repo_file(username, coprname, chroot, repofile): .format(repofile)) - if "-" not in reponame: - return page_not_found( - "Bad repository name: {0}. Must be username-projectname" - .format(reponame)) - copr = None try: # query.one() is used since it fetches all builds, unlike @@ -492,12 +487,10 @@ def generate_repo_file(username, coprname, chroot, repofile): return page_not_found( "Project {0}/{1} does not exist".format(username, coprname)) - try: - mock_chroot = coprs_logic.MockChrootsLogic.get_from_name(chroot).one() - except sqlalchemy.orm.exc.NoResultFound: + mock_chroot = coprs_logic.MockChrootsLogic.get_from_name(chroot, + noarch=True).first() + if not mock_chroot: return page_not_found("Chroot {0} does not exist".format(chroot)) - except ValueError as e: - return page_not_found(str(e)) url = "" for build in copr.builds:

9 years, 11 months

1
0
0 / 0

[copr] master: api search fix (bcc0230)

by asamalik＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit bcc02305686529814685bb2d376896d2d1df5d0b Author: Adam Samalik <asamalik(a)redhat.com> Date: Mon Jun 9 12:37:40 2014 +0200 api search fix >--------------------------------------------------------------- .../coprs/views/api_ns/api_general.py | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) 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 4de29bb..b253c1e 100644 --- a/frontend/coprs_frontend/coprs/views/api_ns/api_general.py +++ b/frontend/coprs_frontend/coprs/views/api_ns/api_general.py @@ -470,15 +470,19 @@ def api_coprs_search_by_project(project=None): project = flask.request.args.get("project", None) or project httpcode = 200 if project: - query = coprs_logic.CoprsLogic.get_multiple_fulltext( - flask.g.user, project) + try: + query = coprs_logic.CoprsLogic.get_multiple_fulltext( + flask.g.user, project) + + repos = query.all() + output = {"output": "ok", "repos": []} + for repo in repos: + output["repos"].append({"username": repo.owner.name, + "coprname": repo.name, + "description": repo.description}) + except ValueError as e: + output = {"output": "nook", "error": str(e)} - repos = query.all() - output = {"output": "ok", "repos": []} - for repo in repos: - output["repos"].append({"username": repo.owner.name, - "coprname": repo.name, - "description": repo.description}) else: output = {"output": "notok", "error": "Invalid request"} httpcode = 500

9 years, 11 months

1
0
0 / 0

[copr] master: fix typo in exception message printing (26f9563)

by Miroslav Suchý

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 26f9563e855fe872f86e0f9c58e956c94fa0b42b Author: Pavel Raiskup <praiskup(a)redhat.com> Date: Wed Jun 4 11:07:00 2014 +0200 fix typo in exception message printing regression caused by f005609b >--------------------------------------------------------------- backend/copr-be.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/backend/copr-be.py b/backend/copr-be.py index 456ea65..c0280a8 100755 --- a/backend/copr-be.py +++ b/backend/copr-be.py @@ -63,7 +63,7 @@ class CoprJobGrab(multiprocessing.Process): except requests.RequestException as e: self.event("Error retrieving jobs from {0}: {1}".format( - (self.opts.frontend_url, e))) + self.opts.frontend_url, e)) else: try: r_json = json.loads(r.content) # using old requests on el6 :(

9 years, 11 months

1
0
0 / 0

[copr] master: WSGIPassAuthorization needs to be on (03c704a)

by Miroslav Suchý

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 03c704a92d990782f7328d6708b283ed1b64084c Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Jun 4 17:25:04 2014 +0200 WSGIPassAuthorization needs to be on not sure why it is commented, but in production it must be uncommented otherwise backend will be unable to auth >--------------------------------------------------------------- frontend/coprs_frontend/coprs.conf.example | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/frontend/coprs_frontend/coprs.conf.example b/frontend/coprs_frontend/coprs.conf.example index 61ebe77..34cceb6 100644 --- a/frontend/coprs_frontend/coprs.conf.example +++ b/frontend/coprs_frontend/coprs.conf.example @@ -1,7 +1,7 @@ <VirtualHost 127.0.0.1:8000> ServerName 127.0.0.1 - #WSGIPassAuthorization On + WSGIPassAuthorization On WSGIDaemonProcess 127.0.0.1 user=copr-fe group=copr-fe threads=5 WSGIScriptAlias / /usr/share/copr/coprs_frontend/application WSGIProcessGroup 127.0.0.1

9 years, 11 months

1
0
0 / 0

[copr] master: 1102788 - Increase number of file descriptors on the build machine (f7178ae)

by Miroslav Suchý

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit f7178ae71426dc806be3125e8bcb529b6186bc82 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Jun 2 13:56:31 2014 +0200 1102788 - Increase number of file descriptors on the build machine >--------------------------------------------------------------- backend/playbooks/builderpb.yml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/backend/playbooks/builderpb.yml b/backend/playbooks/builderpb.yml index 67b3470..72fa12f 100644 --- a/backend/playbooks/builderpb.yml +++ b/backend/playbooks/builderpb.yml @@ -71,4 +71,4 @@ - epel-5-x86_64.cfg - epel-5-i386.cfg - +- lineinfile: dest=/root/.bashrc line="ulimit -n 10240" insertafter=EOF

9 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

copr-commits June 2014