Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
commit 490c4b0c921df328573a2a3e9526452939e44018 Author: Valentin Gologuzov vgologuz@redhat.com Date: Thu Feb 19 00:03:55 2015 +0100
[frontend][backend] [rhbz:#1091640] RFE: Release specific additional repos
backend/backend/mockremote/builder.py | 7 ++++--- .../coprs/templates/coprs/_coprs_forms.html | 7 +++++++ 2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/backend/backend/mockremote/builder.py b/backend/backend/mockremote/builder.py index a981482..32d2884 100644 --- a/backend/backend/mockremote/builder.py +++ b/backend/backend/mockremote/builder.py @@ -240,19 +240,20 @@ class Builder(object): def pre_process_repo_url(self, repo_url): """ Expands variables and sanitize repo url to be used for mock config - maybe more sophisticated approach, see https://bugzilla.redhat.com/attachment.cgi?id=971075&action=diff """ try: parsed_url = urlparse(repo_url) if parsed_url.scheme == "copr": user = parsed_url.netloc prj = parsed_url.path.split("/")[1] - repo_url = "{}/{}/{}/{}".format( - self.opts.results_baseurl, user, prj, self.chroot) + repo_url = "/".join([self.opts.results_baseurl, user, prj, self.chroot])
else: if "rawhide" in self.chroot: repo_url = repo_url.replace("$releasever", "rawhide") + # custom expand variables + repo_url = repo_url.replace("$chroot", self.chroot) + repo_url = repo_url.replace("$distname", self.chroot.split("-")[0])
return pipes.quote(repo_url) except Exception as err: diff --git a/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html b/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html index f6179b2..f68d87b 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html +++ b/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html @@ -58,6 +58,13 @@ <!-- Repos section --> {{ render_field(form.repos, rows=5, cols=50, placeholder='Optional - URL to additional yum repos, which can be used during build. Space separated. This should be baseurl from .repo file. E.g.: http://copr-be.cloud.fedoraproject.org/results/rhughes/f20-gnome-3-12/fedora...') }} <dd class="field-label-help"> + Available variables to expand (variable: example value): + <ul> + <li><b>$chroot</b> fedora-21-x86_64 </li> + <li><b>$releasever</b> 21 </li> + <li><b>$basearch</b> x86-64</li> + <li><b>$distname</b> fedora </li> + </ul> To reference another Copr use format: <code>"copr://{project owner}/{project name}"</code> </dd>