Merge lp:~albertomilone/jockey/pkg-version into lp:jockey

[Alberto Milone]

This branch adds initial support for retrieving the package version which, together with the code in pkg-version-ubuntu, allows us to fix LP: #543176

[Martin Pitt (pitti)]

Looks fine, please merge.

review: Approve

[Martin Pitt (pitti)]

Erm, wait a minute. A handler already has a "version" field. When I saw that patch, I thought we just forgot to export it, but we do. Why doesn't the nvidia driver just set this?

review: Needs Information

[Martin Pitt (pitti)]

Discussed on IRC. IMHO this will introduce duplicate structures into the core code which we won't ever get rid of again, and only for a corner case. Remember that you explicitly wanted to name the package "current", not "195"; so we should actually call it "current". Otherwise it'll create more confusion than it solves, since the package names in Jockey do not (always) reflect the package names in software-center etc.

If i18n is a concern, we have the ability to translate package descriptions, so maybe we should use that?

review: Disapprove

[Alberto Milone (albertomilone)]

A few things depend on the version field (in which we can find the driver flavour) already: the kernel module name, the package name and the recommended() method.

The package version doesn't necessarily match the driver flavour.

Unmerged revisions

627. By Alberto Milone on 2010-04-11

Add pkg_version() method which determines the value
of handler_info['pkg_version'].

=== modified file 'jockey/backend.py'
--- jockey/backend.py	2010-03-11 16:11:53 +0000
+++ jockey/backend.py	2010-04-11 19:09:16 +0000
@@ -237,6 +237,7 @@
             'changed': str(h.changed()),
             'recommended': str(h.recommended()),
             'announce': str(h.announce),
+            'pkg_version': str(h.pkg_version()),
         }
         for f in ['description', 'rationale', 'can_change']:
             v = getattr(h, f)()

=== modified file 'jockey/handlers.py'
--- jockey/handlers.py	2010-02-01 23:56:33 +0000
+++ jockey/handlers.py	2010-04-11 19:09:16 +0000
@@ -77,6 +77,7 @@
         self.version = None
         self.repository = None
         self._recommended = False
+        self._pkg_version = None
 
     def _package_defaults(self):
         '''Set fallback name/description/freeness from package.'''
@@ -190,6 +191,14 @@
         version of a driver is provided, then it should return False.
         '''
         return self._recommended
+
+    def pkg_version(self):
+        '''Return the package version of a certain driver.
+        
+        This method should return the package version retrieved by the package
+        manager.
+        '''
+        return self._pkg_version
     
     def available(self):
         '''Return if the conditions to use this handler on the system are met.

=== modified file 'jockey/ui.py'
--- jockey/ui.py	2010-04-08 07:41:46 +0000
+++ jockey/ui.py	2010-04-11 19:09:16 +0000
@@ -243,7 +243,10 @@
         result = handler_info['name']
         result = self._(result)
         if 'version' in handler_info:
-            result += ' (%s)' % (self._('version %s') % handler_info['version'])
+            if 'pkg_version' in handler_info:
+                result += ' (%s)' % (self._('version %s') % handler_info['pkg_version'])
+            else:
+                result += ' (%s)' % (self._('version %s') % handler_info['version'])
         if bool(handler_info['recommended']):
             result += ' [%s]' % self.string_recommended
         return result

=== modified file 'tests/backend.py'
--- tests/backend.py	2009-09-21 11:21:44 +0000
+++ tests/backend.py	2010-04-11 19:09:16 +0000
@@ -122,6 +122,7 @@
                 'changed': 'False',
                 'recommended': 'False',
                 'announce': 'True',
+                'pkg_version': 'None',
             })
 
     def test_set_enabled(self):
@@ -333,6 +334,7 @@
                 'package': 'mesa-vanilla',
                 'recommended': 'False',
                 'announce': 'True',
+                'pkg_version': 'None',
             })
 
     def test_handler_files(self):

=== modified file 'tests/handlers.py'
--- tests/handlers.py	2009-04-01 08:24:07 +0000
+++ tests/handlers.py	2010-04-11 19:09:16 +0000
@@ -132,6 +132,7 @@
         self.assert_(h.free())
         self.assert_(h.enabled())
         self.assertEqual(h.recommended(), False)
+        self.assertEqual(h.pkg_version(), None)
         self.assert_(h.used())
         self.assertEqual(h.available(), None)
         
@@ -166,6 +167,7 @@
         self.failIf(h.free())
         self.assert_(h.enabled())
         self.assertEqual(h.recommended(), False)
+        self.assertEqual(h.pkg_version(), None)
         self.failIf(h.used())
         self.assertEqual(h.available(), None)