Merge lp:~zematynnad/ubuntu-webcatalog/i386_listed_twice_1020124 into lp:ubuntu-webcatalog

[Danny Tamez]

Fix for multiarch packages being listed twice.

Overview
=========
This branch is a fix for webcatalog applications that are duplicates because of multiarch package names.

Details
========
Two different issues are addressed in this branch. The first deals with arcane package names found in desktop files. There are only a few remaining apps that have this problem and this branch will prevent them from re-appearing. They will have to be manually deleted from the database in production. The second issue is at that at the apt-cache level multiarch packages can sneak back into our database as well. This is now being prevented from forcing single architecture mode. Once ARM and other architectures are coming into play we will need to expand the package configuration to accommodate them as well.

Testing
========
$fab test:pg=True

=== modified file 'src/webcatalog/management/commands/import_app_install_data.py'
--- src/webcatalog/management/commands/import_app_install_data.py	2012-07-02 21:25:30 +0000
+++ src/webcatalog/management/commands/import_app_install_data.py	2012-07-05 16:12:27 +0000
@@ -80,6 +80,8 @@
         if not os.path.exists(series_cache_location):
             self.create_apt_cache(series_cache_location)
 
+        # Force all packages into single architecture mode
+        apt.apt_pkg.config.set("APT::Architecture", "i386")
         cache = apt.Cache(rootdir=series_cache_location)
         try:
             # XXX michaeln bug=879268 Lucid doesnt know about translations.
@@ -193,6 +195,11 @@
         form = ArchiveApplicationForm.get_form_from_desktop_data(
             data, distroseries)
 
+        pkgname = form.data.get('package_name', '')
+        if ":" in pkgname:
+            self.output("skipped multiarch pkg '%s'" % pkgname)
+            return
+
         if form.is_valid():
             app = form.save()
             app.update_departments()