Merge branch 'archweb' into archweb-generic2

9 files changed, 34 insertions, 13 deletions

diff --git a/packages/migrations/0002_populate_package_relation.py b/packages/migrations/0002_populate_package_relation.py
index 738e068f..b0d32c7a 100644
--- a/packages/migrations/0002_populate_package_relation.py
+++ b/packages/migrations/0002_populate_package_relation.py
@@ -11,7 +11,6 @@ class Migration(DataMigration):
     )
 
     def forwards(self, orm):
-        "Write your forwards methods here."
         # search by pkgbase first and insert those records
         qs = orm['main.Package'].objects.exclude(maintainer=None).exclude(
                 pkgbase=None).distinct().values('pkgbase', 'maintainer_id')
@@ -29,7 +28,6 @@ class Migration(DataMigration):
                     defaults={'user_id': row['maintainer_id']})
 
     def backwards(self, orm):
-        "Write your backwards methods here."
         if not db.dry_run:
             orm.PackageRelation.objects.all().delete()
         pass
diff --git a/packages/models.py b/packages/models.py
index 7bcdc000..f830aade 100644
--- a/packages/models.py
+++ b/packages/models.py
@@ -321,6 +321,16 @@ class Update(models.Model):
         return Package.objects.normal().filter(
                 pkgname=self.pkgname, arch=self.arch)
 
+    def replacements(self):
+        pkgs = Package.objects.normal().filter(
+                replaces__name=self.pkgname)
+        if not self.arch.agnostic:
+            # make sure we match architectures if possible
+            arches = set(Arch.objects.filter(agnostic=True))
+            arches.add(self.arch)
+            pkgs = pkgs.filter(arch__in=arches)
+        return pkgs
+
     def __unicode__(self):
         return u'%s of %s on %s' % (self.get_action_flag_display(),
                 self.pkgname, self.created)
diff --git a/packages/sql/search_indexes.postgresql_psycopg2.sql b/packages/sql/search_indexes.postgresql_psycopg2.sql
new file mode 100644
index 00000000..a7eaf998
--- /dev/null
+++ b/packages/sql/search_indexes.postgresql_psycopg2.sql
@@ -0,0 +1,3 @@
+CREATE EXTENSION IF NOT EXISTS pg_trgm;
+CREATE INDEX packages_pkgname_trgm_gist ON packages USING gist (UPPER(pkgname) gist_trgm_ops);
+CREATE INDEX packages_pkgdesc_trgm_gist ON packages USING gist (UPPER(pkgdesc) gist_trgm_ops);
diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py
index f14fab1e..f7392a96 100644
--- a/packages/templatetags/package_extras.py
+++ b/packages/templatetags/package_extras.py
@@ -37,6 +37,12 @@ class BuildQueryStringNode(template.Node):
 
     def render(self, context):
         qs = parse_qs(context['current_query'])
+        # This is really dirty. The crazy round trips we do on our query string
+        # mean we get things like u'\xe2\x98\x83' in our views, when we should
+        # have simply u'\u2603' or a byte string of the UTF-8 value. Force the
+        # keys and list of values to be byte strings only.
+        qs = {k.encode('latin-1'): [v.encode('latin-1') for v in vals]
+                for k, vals in qs.items()}
         if 'sort' in qs and self.sortfield in qs['sort']:
             if self.sortfield.startswith('-'):
                 qs['sort'] = [self.sortfield[1:]]
@@ -53,10 +59,10 @@ def do_buildsortqs(parser, token):
         tagname, sortfield = token.split_contents()
     except ValueError:
         raise template.TemplateSyntaxError(
-                "%r tag requires a single argument" % tagname)
+                "%r tag requires a single argument" % token)
     if not (sortfield[0] == sortfield[-1] and sortfield[0] in ('"', "'")):
         raise template.TemplateSyntaxError(
-                "%r tag's argument should be in quotes" % tagname)
+                "%r tag's argument should be in quotes" % token)
     return BuildQueryStringNode(sortfield[1:-1])
 
 
diff --git a/packages/utils.py b/packages/utils.py
index a4217fbd..4f3b8665 100644
--- a/packages/utils.py
+++ b/packages/utils.py
@@ -391,7 +391,7 @@ SELECT DISTINCT s.id
     """
     cursor = connection.cursor()
     # query pre-process- fill in table name and placeholders for IN
-    repo_sql = ','.join(['%s' for r in repos])
+    repo_sql = ','.join(['%s' for _ in repos])
     sql = sql % (model._meta.db_table, repo_sql, repo_sql)
     repo_ids = [r.pk for r in repos]
     # repo_ids are needed twice, so double the array
diff --git a/packages/views/__init__.py b/packages/views/__init__.py
index 4c195385..c1f0f492 100644
--- a/packages/views/__init__.py
+++ b/packages/views/__init__.py
@@ -9,7 +9,7 @@ from django.db.models import Q
 from django.http import HttpResponse
 from django.shortcuts import redirect, render
 from django.views.decorators.cache import cache_control
-from django.views.decorators.http import require_GET, require_POST
+from django.views.decorators.http import require_safe, require_POST
 
 from main.models import Package, Arch
 from ..models import PackageRelation
@@ -24,7 +24,7 @@ from .search import search_json
 from .signoff import signoffs, signoff_package, signoff_options, signoffs_json
 
 
-@require_GET
+@require_safe
 @cache_control(public=True, max_age=86400)
 def opensearch(request):
     if request.is_secure():
@@ -37,7 +37,7 @@ def opensearch(request):
             content_type='application/opensearchdescription+xml')
 
 
-@require_GET
+@require_safe
 @cache_control(public=True, max_age=300)
 def opensearch_suggest(request):
     search_term = request.GET.get('q', '')
diff --git a/packages/views/display.py b/packages/views/display.py
index fcf8fdea..021c7ed8 100644
--- a/packages/views/display.py
+++ b/packages/views/display.py
@@ -7,6 +7,7 @@ from django.shortcuts import get_object_or_404, redirect, render
 from django.utils.timezone import now
 
 from main.models import Package, PackageFile, Arch, Repo
+from main.utils import empty_response
 from mirrors.utils import get_mirror_url_for_download
 from ..models import Update
 from ..utils import get_group_info, PackageJSONEncoder
@@ -55,6 +56,8 @@ def recently_removed_package(request, name, repo, arch, cutoff=CUTOFF):
     try:
         update = match.latest()
         elsewhere = update.elsewhere()
+        if len(elsewhere) == 0:
+            elsewhere = update.replacements()
         if len(elsewhere) == 1:
             return redirect(elsewhere[0])
         context = {
@@ -124,6 +127,8 @@ def details(request, name='', repo='', arch=''):
             pkg = Package.objects.select_related(
                     'arch', 'repo', 'packager').get(pkgname=name,
                     repo=repo_obj, arch=arch_obj)
+            if request.method == 'HEAD':
+                return empty_response()
             return render(request, 'packages/details.html', {'pkg': pkg})
         except Package.DoesNotExist:
             # attempt a variety of fallback options before 404ing
@@ -223,8 +228,6 @@ def download(request, name, repo, arch):
     if pkg.arch.agnostic:
         # grab the first non-any arch to fake the download path
         arch = Arch.objects.exclude(agnostic=True)[0].name
-    values = {
-    }
     url = '{host}{repo}/os/{arch}/{filename}'.format(host=url.url,
             repo=pkg.repo.name.lower(), arch=arch, filename=pkg.filename)
     return redirect(url)
diff --git a/packages/views/flag.py b/packages/views/flag.py
index 92b35b70..69ca3c9f 100644
--- a/packages/views/flag.py
+++ b/packages/views/flag.py
@@ -110,7 +110,7 @@ def flag(request, name, repo, arch):
                 subject = '%s package [%s] marked out-of-date' % \
                         (pkg.repo.name, pkg.pkgname)
                 for maint in maints:
-                    if maint.userprofile.notify == True:
+                    if maint.userprofile.notify is True:
                         toemail.append(maint.email)
 
             if toemail:
@@ -133,7 +133,6 @@ def flag(request, name, repo, arch):
             return redirect('package-flag-confirmed', name=name, repo=repo,
                     arch=arch)
     else:
-        initial = {}
         form = FlagForm(authenticated=authenticated)
 
     context = {
diff --git a/packages/views/search.py b/packages/views/search.py
index 0362602e..b3778172 100644
--- a/packages/views/search.py
+++ b/packages/views/search.py
@@ -7,7 +7,7 @@ from django.http import HttpResponse
 from django.views.generic import ListView
 
 from main.models import Package, Arch, Repo
-from main.utils import make_choice
+from main.utils import empty_response, make_choice
 from ..models import PackageRelation
 from ..utils import attach_maintainers, PackageJSONEncoder
 
@@ -99,6 +99,8 @@ class SearchListView(ListView):
     allowed_sort = list(sort_fields) + ["-" + s for s in sort_fields]
 
     def get(self, request, *args, **kwargs):
+        if request.method == 'HEAD':
+            return empty_response()
         self.form = PackageSearchForm(data=request.GET,
                 show_staging=self.request.user.is_authenticated())
         return super(SearchListView, self).get(request, *args, **kwargs)