Merge lp:~albertomilone/jockey/pkg-version-ubuntu into lp:~ubuntu-core-dev/jockey/ubuntu

[Alberto Milone]

This branch completes support for retrieving the package version (this is not mandatory and is currently used only by the nvidia handler) which, together with the code in the pkg-version branch, allows us to fix LP: #543176

[Martin Pitt (pitti)]

See https://code.launchpad.net/~albertomilone/jockey/pkg-version/+merge/23189 for details.

review: Disapprove

Unmerged revisions

415. By Alberto Milone on 2010-04-11

* jockey/oslib.py:
  - Implement the package_version() method so that we
    can get the version of a package from apt.
* data/handlers/nvidia.py:
  - Implement the pkg_version() method so that we can
    show the version of the driver instead of being
    limited to the information carried by the version
    attribute. For example, in the case of the
    nvidia-current package, self.version is an
    unlocalised and therefore rather confusing string
    i.e. current when it should really be something
    like 195 (LP: #543176).

414. By Alberto Milone on 2010-04-11

Merge from trunk

=== modified file 'data/handlers/nvidia.py'
--- data/handlers/nvidia.py	2010-04-10 21:01:07 +0000
+++ data/handlers/nvidia.py	2010-04-11 19:12:20 +0000
@@ -40,6 +40,7 @@
 
         self._module_alias = 'nvidia'
         self._recommended = None
+        self._pkg_version = None
         self._do_rebind = False
         self._alternatives = Alternatives('gl_conf')
         self.version = version
@@ -115,6 +116,12 @@
             self._recommended = self.package == nd.selectDriver()
         return self._recommended
 
+    def pkg_version(self):
+        if self._pkg_version == None:
+            self._pkg_version = OSLib.inst.package_version(self.package)
+            self._pkg_version = self._pkg_version and self._pkg_version.split('.')[0]
+        return self._pkg_version
+
     def enabled(self):
         # See if nvidia (e.g. nvidia-current) is the current alternative
         target_alternative = self._alternatives.get_alternative_by_name(self.package)

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-10 21:01:07 +0000
+++ debian/changelog	2010-04-11 19:12:20 +0000
@@ -6,8 +6,21 @@
       its alias are not blacklisted. This prevents Jockey from claiming
       that the installation of nvidia driver failed when when it
       didn't (LP: #552653).
+  * Get support for pkg_version() from trunk.
+  * jockey/oslib.py:
+    - Implement the package_version() method so that we
+      can get the version of a package from apt.
+  * data/handlers/nvidia.py:
+    - Implement the pkg_version() method so that we can
+      show the version of the driver instead of being
+      limited to the information carried by the "version"
+      attribute. For example, in the case of the
+      "nvidia-current" package, self.version is an
+      unlocalised and therefore rather confusing string
+      i.e. "current" when it should really be something
+      like "195" (LP: #543176).
 
- -- Alberto Milone <[e-mail]>  Sat, 10 Apr 2010 22:54:28 +0200
+ -- Alberto Milone <[e-mail]>  Sun, 11 Apr 2010 19:12:37 +0200
 
 jockey (0.5.8-0ubuntu6) lucid; urgency=low
 

=== modified file 'gtk/jockey-gtk'
--- gtk/jockey-gtk	2010-02-02 00:21:04 +0000
+++ gtk/jockey-gtk	2010-04-11 19:12:20 +0000
@@ -181,7 +181,7 @@
             indicator = jockey.ui.AbstractUI.ui_notification(self, None, None)
             print 'GTK ui_notification: got appindicator'
             menu = gtk.Menu()
-            item = gtk.MenuItem('Install Drivers')
+            item = gtk.MenuItem(self.string_install_drivers)
             menu.append(item)
             item.show()
             item.connect('activate', lambda widget: self.ui_show_main())

=== modified file 'jockey/backend.py'
--- jockey/backend.py	2010-03-11 16:32:22 +0000
+++ jockey/backend.py	2010-04-11 19:12:20 +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-02 00:21:04 +0000
+++ jockey/handlers.py	2010-04-11 19:12:20 +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/oslib.py'
--- jockey/oslib.py	2010-03-22 14:55:16 +0000
+++ jockey/oslib.py	2010-04-11 19:12:20 +0000
@@ -172,6 +172,17 @@
 
         raise ValueError, 'package %s does not exist' % package
 
+    def package_version(self, package):
+        '''Return the version of a given package.'''
+
+        out = self._apt_show(package)
+        if out:
+            for l in out.splitlines():
+                if l.startswith('Version:'):
+                    s = l.split()[-1]
+                    return s.strip()
+        return None
+
     def package_files(self, package):
         '''Return a list of files shipped by a package.
         

=== modified file 'jockey/ui.py'
--- jockey/ui.py	2010-03-26 16:41:03 +0000
+++ jockey/ui.py	2010-04-11 19:12:20 +0000
@@ -170,6 +170,7 @@
         # this is used when one version of a driver is recommended over others
         self.string_recommended = self._('Recommended')
         self.string_license_dialog_title = self._('License Text for Device Driver')
+        self.string_install_drivers = self._('Install Drivers')
 
     def main_window_title(self):
         '''Return an appropriate translated window title.
@@ -242,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 'kde/jockey-kde'
--- kde/jockey-kde	2010-03-20 21:36:17 +0000
+++ kde/jockey-kde	2010-04-11 19:12:20 +0000
@@ -94,6 +94,8 @@
 
         # connect signals
         self.mw.connect(self.mw.buttonBox, SIGNAL('rejected()'), self.on_buttonBox_rejected)
+        self.mw.connect(self.mw, SIGNAL('rejected()'), self.on_buttonBox_rejected) # A minor hack, but since we now exit with sys.exit(  ) - we will avoid a Segmentation fault
+                                                                                 # This is not the best fix, but is 100x better than no fix.
         self.mw.connect(self.mw.buttonBox, SIGNAL('helpRequested()'),
                         self.on_buttonBox_helpRequested)
 

=== modified file 'tests/backend.py'
--- tests/backend.py	2009-09-21 11:21:44 +0000
+++ tests/backend.py	2010-04-11 19:12:20 +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:26:35 +0000
+++ tests/handlers.py	2010-04-11 19:12:20 +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)