Merge lp:~fcwu-tw/jockey/lp1196848 into lp:ubuntu/precise-proposed/jockey

[Doro Wu]

Fixed bug 1196848

[Alberto Milone (albertomilone)]

The patch looks good to me but I'll probably integrate your change with some changes I need to make so that we can use the same SRU for all of them

Unmerged revisions

157. By Doro Wu on 2013-07-02

* data/handlers/fglrx.py
  - Jockey returns wrong enablement status of fglrx within iGPU mode.
    (LP: 1196848)

=== modified file 'data/handlers/fglrx.py'
--- data/handlers/fglrx.py	2013-01-07 10:55:32 +0000
+++ data/handlers/fglrx.py	2013-07-02 08:39:58 +0000
@@ -104,9 +104,9 @@
 
     def enabled(self):
         # See if fglrx is the current alternative
-        target_alternative = self._alternatives.get_alternative_by_name('fglrx')
+        target_alternative = [alt for alt in self._alternatives.list_alternatives() if alt.split('/')[-2] in ('pxpress', 'fglrx')]
         current_alternative = self._alternatives.get_current_alternative()
-        other_target_alternative = self._other_alternatives.get_alternative_by_name('fglrx')
+        other_target_alternative = [alt for alt in self._other_alternatives.list_alternatives() if alt.split('/')[-2] in ('pxpress', 'fglrx')]
         other_current_alternative = self._other_alternatives.get_current_alternative()
 
         logging.debug('fglrx.enabled(%s): target_alt %s current_alt %s other target alt %s other current alt %s',
@@ -116,8 +116,8 @@
         if current_alternative is None:
             logging.debug('current alternative of %s is None, not enabled', self.module)
             return False
-        if current_alternative != target_alternative or \
-           other_current_alternative != other_target_alternative:
+        if current_alternative not in target_alternative or \
+           other_current_alternative not in other_target_alternative:
             logging.debug('%s is not the alternative in use', self.module)
             return False
 

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-16 11:19:02 +0000
+++ debian/changelog	2013-07-02 08:39:58 +0000
@@ -1,3 +1,11 @@
+jockey (0.9.7-0ubuntu7.10) precise; urgency=low
+
+  * data/handlers/fglrx.py
+    - Jockey returns wrong enablement status of fglrx within iGPU mode. 
+      (LP: 1196848)
+
+ -- Doro Wu <[e-mail]>  Tue, 02 Jul 2013 04:24:41 -0400
+
 jockey (0.9.7-0ubuntu7.9) precise-proposed; urgency=low
 
   * jockey/kerneldetection.py: