Merge lp:~yofel/software-properties/lp-819793 into lp:software-properties

Proposed by Philip Muškovac on 2011-10-14
Status: Merged
Merged at revision: 725
Proposed branch: lp:~yofel/software-properties/lp-819793
Merge into: lp:software-properties
Diff against target: 19 lines (+2/-5)
1 file modified
softwareproperties/kde/SoftwarePropertiesKDE.py (+2/-5)
To merge this branch: bzr merge lp:~yofel/software-properties/lp-819793
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2011-10-14 Pending
Review via email: mp+79424@code.launchpad.net

Description of the change

Fix for bug 819793 as disable_child_source() now seems to want the template name as parameter, not the template itself.

This should get into oneiric-updates once merged (If it's the right way to fix this)

To post a comment you must log in.
725. By Philip Muškovac on 2011-10-14

throw the now unused loop out

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwareproperties/kde/SoftwarePropertiesKDE.py'
2--- softwareproperties/kde/SoftwarePropertiesKDE.py 2011-07-11 10:48:09 +0000
3+++ softwareproperties/kde/SoftwarePropertiesKDE.py 2011-10-14 20:31:23 +0000
4@@ -445,14 +445,11 @@
5 """
6 tickBox = kapp.sender()
7 name = str(tickBox.objectName())
8- for template in self.distro.source_template.children:
9- if name == template.name:
10- aptTemplate = template
11
12 if tickBox.checkState() == Qt.Checked:
13- self.enable_child_source(aptTemplate)
14+ self.enable_child_source(name)
15 elif tickBox.checkState() == Qt.Unchecked:
16- self.disable_child_source(aptTemplate)
17+ self.disable_child_source(name)
18 # no way to set back to mixed state so turn off tristate
19 tickBox.setTristate(False)
20

Subscribers

People subscribed via source and target branches

to status/vote changes: