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

Proposed by Doro Wu on 2013-07-02
Status: Needs review
Proposed branch: lp:~fcwu-tw/jockey/lp1196848
Merge into: lp:ubuntu/precise-proposed/jockey
Diff against target: 42 lines (+12/-4)
2 files modified
data/handlers/fglrx.py (+4/-4)
debian/changelog (+8/-0)
To merge this branch: bzr merge lp:~fcwu-tw/jockey/lp1196848
Reviewer Review Type Date Requested Status
Alberto Milone 2013-07-02 Pending
Review via email: mp+172486@code.launchpad.net

Description of the change

To post a comment you must log in.
Alberto Milone (albertomilone) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
104104
105 def enabled(self):105 def enabled(self):
106 # See if fglrx is the current alternative106 # See if fglrx is the current alternative
107 target_alternative = self._alternatives.get_alternative_by_name('fglrx')107 target_alternative = [alt for alt in self._alternatives.list_alternatives() if alt.split('/')[-2] in ('pxpress', 'fglrx')]
108 current_alternative = self._alternatives.get_current_alternative()108 current_alternative = self._alternatives.get_current_alternative()
109 other_target_alternative = self._other_alternatives.get_alternative_by_name('fglrx')109 other_target_alternative = [alt for alt in self._other_alternatives.list_alternatives() if alt.split('/')[-2] in ('pxpress', 'fglrx')]
110 other_current_alternative = self._other_alternatives.get_current_alternative()110 other_current_alternative = self._other_alternatives.get_current_alternative()
111111
112 logging.debug('fglrx.enabled(%s): target_alt %s current_alt %s other target alt %s other current alt %s',112 logging.debug('fglrx.enabled(%s): target_alt %s current_alt %s other target alt %s other current alt %s',
@@ -116,8 +116,8 @@
116 if current_alternative is None:116 if current_alternative is None:
117 logging.debug('current alternative of %s is None, not enabled', self.module)117 logging.debug('current alternative of %s is None, not enabled', self.module)
118 return False118 return False
119 if current_alternative != target_alternative or \119 if current_alternative not in target_alternative or \
120 other_current_alternative != other_target_alternative:120 other_current_alternative not in other_target_alternative:
121 logging.debug('%s is not the alternative in use', self.module)121 logging.debug('%s is not the alternative in use', self.module)
122 return False122 return False
123123
124124
=== 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 @@
1jockey (0.9.7-0ubuntu7.10) precise; urgency=low
2
3 * data/handlers/fglrx.py
4 - Jockey returns wrong enablement status of fglrx within iGPU mode.
5 (LP: 1196848)
6
7 -- Doro Wu <doro.wu@canonical.com> Tue, 02 Jul 2013 04:24:41 -0400
8
1jockey (0.9.7-0ubuntu7.9) precise-proposed; urgency=low9jockey (0.9.7-0ubuntu7.9) precise-proposed; urgency=low
210
3 * jockey/kerneldetection.py:11 * jockey/kerneldetection.py:

Subscribers

People subscribed via source and target branches

to all changes: