Merge lp:~smoser/ubuntu-reports/trunk.fix-server-merges into lp:ubuntu-reports

[Scott Moser]

server/merges.py: update use of python-apt for versions in trusty

see LP: #1216655. python-apt changed interfaces and this just adjusts
to that change. The new path works on 12.04 versions of python-apt as well, so this is actually backwards compatible.

server/merges.py: update use of python-apt for versions in trusty

see LP: #1216655. python-apt changed interfaces and this just adjusts
to that change.

I suspect that the system that this code runs on to produce
  http://reqorts.qa.ubuntu.com/reports/ubuntu-server/merges.html
got updated from precise to trusty and this is currently broken.

[lp:~smoser/ubuntu-reports/trunk.fix-server-merges]

132. By Scott Moser on 2015-08-03

remove the old path as precise supports new path.

[Dave Walker (davewalker)]

review: Approve

=== modified file 'server/merges.py'
--- server/merges.py	2013-07-24 15:28:21 +0000
+++ server/merges.py	2015-08-03 16:07:01 +0000
@@ -187,8 +187,8 @@
 def debian_newer(ubuntu,debian):
   if debian == 0:
     return False
-  apt_pkg.InitSystem()
-  delta = apt_pkg.VersionCompare(ubuntu, debian)
+  apt_pkg.init_system()
+  delta = apt_pkg.version_compare(ubuntu, debian)
   if delta < 0:
     return True
   else: