Merge branch 'master' of git://projects.archlinux.org/archweb

Conflicts:
	templates/packages/details.html
	templates/packages/files.html

3 files changed, 72 insertions, 30 deletions

diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py
index 09e48559..3f1e9ddf 100644
--- a/devel/management/commands/reporead.py
+++ b/devel/management/commands/reporead.py
@@ -88,11 +88,13 @@ class Pkg(object):
     bare = ( 'name', 'base', 'arch', 'desc', 'filename',
             'md5sum', 'url', 'builddate', 'packager' )
     number = ( 'csize', 'isize' )
+    version_re = re.compile(r'^((\d+):)?(.+)-([^-]+)$')
 
     def __init__(self, repo):
         self.repo = repo
         self.ver = None
         self.rel = None
+        self.epoch = 0
         for k in self.bare + self.number:
             setattr(self, k, None)
 
@@ -106,13 +108,22 @@ class Pkg(object):
             elif k == 'force':
                 setattr(self, k, True)
             elif k == 'version':
-                ver, rel = v[0].rsplit('-')
-                setattr(self, 'ver', ver)
-                setattr(self, 'rel', rel)
+                match = self.version_re.match(v[0])
+                self.ver = match.group(3)
+                self.rel = match.group(4)
+                if match.group(2):
+                    self.epoch = int(match.group(2))
             else:
                 # files, depends, etc.
                 setattr(self, k, v)
 
+    @property
+    def full_version(self):
+        '''Very similar to the main.models.Package method.'''
+        if self.epoch > 0:
+            return u'%d:%s-%s' % (self.epoch, self.ver, self.rel)
+        return u'%s-%s' % (self.ver, self.rel)
+
 
 def find_user(userstring):
     '''
@@ -184,6 +195,7 @@ def populate_pkg(dbpkg, repopkg, force=False, timestamp=None):
         dbpkg.pkgbase = repopkg.name
     dbpkg.pkgver = repopkg.ver
     dbpkg.pkgrel = repopkg.rel
+    dbpkg.epoch = repopkg.epoch
     dbpkg.pkgdesc = repopkg.desc
     dbpkg.url = repopkg.url
     dbpkg.filename = repopkg.filename
@@ -230,11 +242,11 @@ def populate_pkg(dbpkg, repopkg, force=False, timestamp=None):
 
 def populate_files(dbpkg, repopkg, force=False):
     if not force:
-        if dbpkg.pkgver != repopkg.ver or dbpkg.pkgrel != repopkg.rel:
-            logger.info("db version (%s-%s) didn't match repo version (%s-%s) "
-                    "for package %s, skipping file list addition",
-                    dbpkg.pkgver, dbpkg.pkgrel, repopkg.ver, repopkg.rel,
-                    dbpkg.pkgname)
+        if dbpkg.pkgver != repopkg.ver or dbpkg.pkgrel != repopkg.rel \
+                or dbpkg.epoch != repopkg.epoch:
+            logger.info("DB version (%s) didn't match repo version "
+                    "(%s) for package %s, skipping file list addition",
+                    dbpkg.full_version, repopkg.full_version, dbpkg.pkgname)
             return
         if not dbpkg.files_last_update or not dbpkg.last_update:
             pass
@@ -273,25 +285,23 @@ def db_update(archname, reponame, pkgs, options):
     filesonly = options.get('filesonly', False)
     repository = Repo.objects.get(name__iexact=reponame)
     architecture = Arch.objects.get(name__iexact=archname)
-    dbpkgs = Package.objects.filter(arch=architecture, repo=repository)
-    # It makes sense to fully evaluate our DB query now because we will
-    # be using 99% of the objects in our "in both sets" loop. Force eval
-    # by calling list() on the QuerySet.
-    list(dbpkgs)
+    # no-arg order_by() removes even the default ordering; we don't need it
+    dbpkgs = Package.objects.filter(
+            arch=architecture, repo=repository).order_by()
     # This makes our inner loop where we find packages by name *way* more
     # efficient by not having to go to the database for each package to
     # SELECT them by name.
     dbdict = dict([(pkg.pkgname, pkg) for pkg in dbpkgs])
 
     logger.debug("Creating sets")
-    dbset = set([pkg.pkgname for pkg in dbpkgs])
+    dbset = set(dbdict.keys())
     syncset = set([pkg.name for pkg in pkgs])
     logger.info("%d packages in current web DB", len(dbset))
     logger.info("%d packages in new updating db", len(syncset))
     in_sync_not_db = syncset - dbset
     logger.info("%d packages in sync not db", len(in_sync_not_db))
 
-    # Try to catch those random orphaning issues that make Eric so unhappy.
+    # Try to catch those random package deletions that make Eric so unhappy.
     if len(dbset):
         dbpercent = 100.0 * len(syncset) / len(dbset)
     else:
@@ -302,12 +312,14 @@ def db_update(archname, reponame, pkgs, options):
     # means we expect the repo to fluctuate a lot.
     msg = "Package database has %.1f%% the number of packages in the " \
             "web database" % dbpercent
-    if not filesonly and \
+    if len(dbset) == 0 and len(syncset) == 0:
+        pass
+    elif not filesonly and \
             len(dbset) > 20 and dbpercent < 50.0 and \
             not repository.testing:
         logger.error(msg)
         raise Exception(msg)
-    if dbpercent < 75.0:
+    elif dbpercent < 75.0:
         logger.warning(msg)
 
     if not filesonly:
@@ -321,8 +333,8 @@ def db_update(archname, reponame, pkgs, options):
         in_db_not_sync = dbset - syncset
         for p in in_db_not_sync:
             logger.info("Removing package %s from database", p)
-            Package.objects.get(
-                pkgname=p, arch=architecture, repo=repository).delete()
+            dbp = dbdict[p]
+            dbp.delete()
 
     # packages in both database and in syncdb (update in database)
     pkg_in_both = syncset & dbset
@@ -334,7 +346,8 @@ def db_update(archname, reponame, pkgs, options):
         # for a non-force, we don't want to do anything at all.
         if filesonly:
             pass
-        elif p.ver == dbp.pkgver and p.rel == dbp.pkgrel:
+        elif p.ver == dbp.pkgver and p.rel == dbp.pkgrel \
+                and p.epoch == dbp.epoch:
             if not force:
                 continue
         else:
@@ -421,10 +434,9 @@ def parse_repo(repopath):
     logger.info("Finished repo parsing, %d total packages", len(pkgs))
     return (reponame, pkgs.values())
 
-def validate_arch(arch):
+def validate_arch(archname):
     "Check if arch is valid."
-    available_arches = [x.name for x in Arch.objects.all()]
-    return arch in available_arches
+    return Arch.objects.filter(name__iexact=archname).exists()
 
 def read_repo(primary_arch, repo_file, options):
     """
@@ -432,21 +444,22 @@ def read_repo(primary_arch, repo_file, options):
     """
     repo, packages = parse_repo(repo_file)
 
-    # sort packages by arch -- to handle noarch stuff
+    # group packages by arch -- to handle noarch stuff
     packages_arches = {}
-    packages_arches['any'] = []
+    for arch in Arch.objects.filter(agnostic=True):
+        packages_arches[arch.name] = []
     packages_arches[primary_arch] = []
 
     for package in packages:
-        if package.arch in ('any', primary_arch):
+        if package.arch in packages_arches:
             packages_arches[package.arch].append(package)
         else:
             # we don't include mis-arched packages
             logger.warning("Package %s arch = %s",
                 package.name,package.arch)
     logger.info('Starting database updates.')
-    for (arch, pkgs) in packages_arches.items():
-        db_update(arch, repo, pkgs, options)
+    for arch in sorted(packages_arches.keys()):
+        db_update(arch, repo, packages_arches[arch], options)
     logger.info('Finished database updates.')
     return 0
 
diff --git a/devel/urls.py b/devel/urls.py
index bcf9c071..41be2b31 100644
--- a/devel/urls.py
+++ b/devel/urls.py
@@ -5,6 +5,8 @@ urlpatterns = patterns('devel.views',
     (r'^clock/$',    'clock'),
     (r'^profile/$',  'change_profile'),
     (r'^newuser/$',  'new_user_form'),
+    (r'^admin_log/(?P<username>.*)/$','admin_log'),
+    (r'^admin_log/$','admin_log'),
 )
 
 # vim: set ts=4 sw=4 et:
diff --git a/devel/views.py b/devel/views.py
index 311922ca..5b8965d8 100644
--- a/devel/views.py
+++ b/devel/views.py
@@ -1,9 +1,11 @@
 from django import forms
 from django.http import HttpResponseRedirect
-from django.contrib.auth.decorators import login_required, permission_required
+from django.contrib.auth.decorators import \
+        login_required, permission_required, user_passes_test
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
 from django.core.mail import send_mail
+from django.shortcuts import get_object_or_404
 from django.template import loader, Context
 from django.views.decorators.cache import never_cache
 from django.views.generic.simple import direct_to_template
@@ -34,11 +36,22 @@ def index(request):
 
     maintainers = get_annotated_maintainers()
 
+    maintained = PackageRelation.objects.filter(
+            type=PackageRelation.MAINTAINER).values('pkgbase')
+    total_orphans = Package.objects.exclude(pkgbase__in=maintained).count()
+    total_flagged_orphans = Package.objects.filter(
+            flag_date__isnull=False).exclude(pkgbase__in=maintained).count()
+    orphan = {
+            'package_count': total_orphans,
+            'flagged_count': total_flagged_orphans,
+    }
+
     page_dict = {
             'todos': Todolist.objects.incomplete().order_by('-date_added'),
             'repos': Repo.objects.all(),
             'arches': Arch.objects.all(),
             'maintainers': maintainers,
+            'orphan': orphan,
             'flagged' : flagged,
             'todopkgs' : todopkgs,
     }
@@ -55,7 +68,9 @@ def clock(request):
     now = datetime.datetime.now()
     utc_now = datetime.datetime.utcnow().replace(tzinfo=pytz.utc)
     for dev in devs:
-        tz = pytz.timezone(dev.userprofile.time_zone)
+        # Work around https://bugs.launchpad.net/pytz/+bug/718673
+        timezone = str(dev.userprofile.time_zone)
+        tz = pytz.timezone(timezone)
         dev.current_time = utc_now.astimezone(tz)
 
     page_dict = {
@@ -167,4 +182,16 @@ def new_user_form(request):
     }
     return direct_to_template(request, 'general_form.html', context)
 
+@user_passes_test(lambda u: u.is_superuser)
+@never_cache
+def admin_log(request, username=None):
+    user = None
+    if username:
+        user = get_object_or_404(User, username=username)
+    context = {
+        'title': "Admin Action Log",
+        'log_user':  user,
+    }
+    return direct_to_template(request, 'devel/admin_log.html', context)
+
 # vim: set ts=4 sw=4 et: