harvest-dev team mailing list archive

[Daniel Holbach <daniel.holbach@xxxxxxxxxx>]

Daniel Holbach has proposed merging lp:~dholbach/harvest/922570 into lp:harvest.

Requested reviews:
  harvest-dev (harvest-dev)
Related bugs:
  Bug #922570 in harvest: "psycopg2.ProgrammingError: can't adapt"
  https://bugs.launchpad.net/harvest/+bug/922570

For more details, see:
https://code.launchpad.net/~dholbach/harvest/922570/+merge/90484
-- 
https://code.launchpad.net/~dholbach/harvest/922570/+merge/90484
Your team harvest-dev is requested to review the proposed merge of lp:~dholbach/harvest/922570 into lp:harvest.

=== modified file 'harvest/opportunities/management/commands/updatepackagesets.py'
--- harvest/opportunities/management/commands/updatepackagesets.py	2010-12-08 08:15:50 +0000
+++ harvest/opportunities/management/commands/updatepackagesets.py	2012-01-27 17:15:30 +0000
@@ -56,7 +56,7 @@
                     package.packagesets.remove(unseeded)
                 for packageset in package.packagesets.all():
                     if packageset.name not in package_mapping[package_name]:
-                        package.packagesets.remove(PackageSet.objects.get(name=packageset))
+                        package.packagesets.remove(packageset)
                 package.save()
         unseeded_packages = SourcePackage.objects.filter(packagesets__isnull=True)
         for u in unseeded_packages:

=== modified file 'harvest/urls.py'
--- harvest/urls.py	2010-12-08 08:15:50 +0000
+++ harvest/urls.py	2012-01-27 17:15:30 +0000
@@ -10,7 +10,7 @@
     url(r'^services/', include('services.urls')),
     url(r'^openid/', include('django_openid_auth.urls')),
     url(r'^logout$', 'common.views.site_logout'),
-    url(r'^admin/(.*)', admin.site.root),
+    url(r'^admin/(.*)', admin.site.urls),
 )
 
 if settings.STATIC_SERVE: