Merge tag 'release_2012-02-18'

Defend against bogus URLs, mirrorlist no FTP by default

Conflicts:
	templates/public/index.html

1 files changed, 6 insertions, 4 deletions

diff --git a/devel/views.py b/devel/views.py
index dc2283ca..793d1520 100644
--- a/devel/views.py
+++ b/devel/views.py
@@ -209,8 +209,10 @@ def report(request, report_name, username=None):
     elif report_name == 'uncompressed-man':
         title = 'Packages with uncompressed manpages'
         # checking for all '.0'...'.9' + '.n' extensions
-        bad_files = PackageFile.objects.filter(directory__contains='/man/',
-                filename__regex=r'\.[0-9n]').exclude(filename__endswith='.gz')
+        bad_files = PackageFile.objects.filter(is_directory=False,
+                directory__contains='/man/',
+                filename__regex=r'\.[0-9n]').exclude(
+                filename__endswith='.gz').exclude(filename__endswith='.html')
         if username:
             pkg_ids = set(packages.values_list('id', flat=True))
             bad_files = bad_files.filter(pkg__in=pkg_ids)
@@ -220,8 +222,8 @@ def report(request, report_name, username=None):
         title = 'Packages with uncompressed infopages'
         # we don't worry about looking for '*.info-1', etc., given that an
         # uncompressed root page probably exists in the package anyway
-        bad_files = PackageFile.objects.filter(directory__endswith='/info/',
-                filename__endswith='.info')
+        bad_files = PackageFile.objects.filter(is_directory=False,
+                directory__endswith='/info/', filename__endswith='.info')
         if username:
             pkg_ids = set(packages.values_list('id', flat=True))
             bad_files = bad_files.filter(pkg__in=pkg_ids)