summaryrefslogtreecommitdiff
path: root/releng
diff options
context:
space:
mode:
Diffstat (limited to 'releng')
-rw-r--r--releng/models.py4
-rw-r--r--releng/views.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/releng/models.py b/releng/models.py
index c1a82589..a4af81ab 100644
--- a/releng/models.py
+++ b/releng/models.py
@@ -139,11 +139,11 @@ class Release(models.Model):
return "iso/%s/" % self.version
def iso_url(self):
- return "iso/%s/archlinux-%s-dual.iso" % (self.version, self.version)
+ return "iso/%s/%s-%s-dual.iso" % (self.version, settings.BRANDING_SLUG, self.version)
def magnet_uri(self):
query = [
- ('dn', "archlinux-%s-dual.iso" % self.version),
+ ('dn', "%s-%s-dual.iso" % (settings.BRANDING_SLUG, self.version)),
]
if settings.TORRENT_TRACKERS:
query.extend(('tr', uri) for uri in settings.TORRENT_TRACKERS)
diff --git a/releng/views.py b/releng/views.py
index 9e7a794e..03ea8a86 100644
--- a/releng/views.py
+++ b/releng/views.py
@@ -53,7 +53,7 @@ class TestForm(forms.ModelForm):
success = forms.BooleanField(
help_text="Only check this if everything went fine. "
"If you ran into problems please create a ticket on <a "
- "href=\"https://bugs.archlinux.org/index.php?project=6\">the "
+ "href=\""+settings.BUGTRACKER_RELENG_URL+"\">the "
"bugtracker</a> (or check that one already exists) and link to "
"it in the comments.",
required=False)
@@ -237,7 +237,7 @@ def release_torrent(request, version):
data = b64decode(release.torrent_data.encode('utf-8'))
response = HttpResponse(data, content_type='application/x-bittorrent')
# TODO: this is duplicated from Release.iso_url()
- filename = 'archlinux-%s-dual.iso.torrent' % release.version
+ filename = '%s-%s-dual.iso.torrent' % (settings.BRANDING_SLUG, release.version)
response['Content-Disposition'] = 'attachment; filename=%s' % filename
return response