Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit baf1b06286aea5fab7091bc016e87e2f956cb1fa
Author: Valentin Gologuzov <vgologuz(a)redhat.com>
Date: Thu Jan 29 21:31:29 2015 +0100
[frontend] correct url for pubkey in .repo
---------------------------------------------------------------
.../coprs_frontend/coprs/templates/coprs/copr.repo | 2 +-
.../coprs/views/coprs_ns/coprs_general.py | 4 +++-
.../test_views/test_coprs_ns/test_coprs_general.py | 18 +++++++-----------
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/copr.repo
b/frontend/coprs_frontend/coprs/templates/coprs/copr.repo
index 15e5e7a..d316ae7 100644
--- a/frontend/coprs_frontend/coprs/templates/coprs/copr.repo
+++ b/frontend/coprs_frontend/coprs/templates/coprs/copr.repo
@@ -3,6 +3,6 @@ name=Copr repo for {{ copr.name }} owned by {{ copr.owner.name }}
baseurl={{ url | fix_url_https_backend }}
skip_if_unavailable=True
gpgcheck=0
-gpgkey={{ url | fix_url_https_backend }}pubkey.gpg
+gpgkey={{ pubkey_url | fix_url_https_backend }}
enabled=1
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 3f8f2c9..be91b69 100644
--- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
+++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
@@ -1,5 +1,6 @@
import time
import re
+import urlparse
import flask
from flask import render_template
@@ -545,8 +546,9 @@ def generate_repo_file(username, coprname, chroot, repofile):
.format(username, coprname))
repo_url = generate_repo_url(mock_chroot, url)
+ pubkey_url = urlparse.urljoin(url, "pubkey.gpg")
response = flask.make_response(
- flask.render_template("coprs/copr.repo", copr=copr, url=repo_url))
+ flask.render_template("coprs/copr.repo", copr=copr, url=repo_url,
pubkey_url=pubkey_url))
response.mimetype = "text/plain"
response.headers["Content-Disposition"] = \
diff --git a/frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
b/frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
index f9d5069..8ecaacc 100644
--- a/frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
+++ b/frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
@@ -713,17 +713,13 @@ class TestCoprRepoGeneration(CoprsTestCase):
f_custom_builds, f_db):
from coprs import app
orig = app.config["ENFORCE_PROTOCOL_FOR_BACKEND_URL"]
- try:
- app.config["ENFORCE_PROTOCOL_FOR_BACKEND_URL"] = "https"
- r = self.tc.get(
- "/coprs/{0}/{1}/repo/fedora-18-x86_64/"
- .format(self.u1.name, self.c1.name))
-
- assert r.status_code == 200
- assert "baseurl=https://bar.baz" in r.data
- except Exception as e:
- app.config["ENFORCE_PROTOCOL_FOR_BACKEND_URL"] = orig
- raise e
+ app.config["ENFORCE_PROTOCOL_FOR_BACKEND_URL"] = "https"
+ r = self.tc.get(
+ "/coprs/{0}/{1}/repo/fedora-18-x86_64/"
+ .format(self.u1.name, self.c1.name))
+
+ assert r.status_code == 200
+ assert "baseurl=https://bar.baz" in r.data
app.config["ENFORCE_PROTOCOL_FOR_BACKEND_URL"] = orig