Merge lp:~yofel/ubuntu/precise/software-properties/944876 into lp:ubuntu/precise/software-properties

[Philip Muškovac]

Precise fix for bug 944876

[Micah Gersten (micahg)]

This was already uplaoded to precise-proposed

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-13 19:12:54 +0000
+++ debian/changelog	2012-04-25 19:26:45 +0000
@@ -1,3 +1,10 @@
+software-properties (0.82.7.1) precise-proposed; urgency=low
+
+  * manually shift the policy index to work around wrong upgrade policy being
+    set. (LP: #944876)
+
+ -- Philip Muškovac <[e-mail]>  Wed, 25 Apr 2012 21:11:57 +0200
+
 software-properties (0.82.7) precise; urgency=low
 
   * software-properties-dbus: Use GLib instead of the deprecated gobject.

=== modified file 'softwareproperties/kde/SoftwarePropertiesKDE.py'
--- softwareproperties/kde/SoftwarePropertiesKDE.py	2011-11-21 16:32:49 +0000
+++ softwareproperties/kde/SoftwarePropertiesKDE.py	2012-04-25 19:26:45 +0000
@@ -149,6 +149,10 @@
   def init_release_upgrades(self):
     " setup the widgets that allow configuring the release upgrades "
     i = self.get_release_upgrades_policy()
+
+    # FIXME: hack for LP: #944876
+    i = (i + 1) % 3
+
     self.userinterface.combobox_release_upgrades.setCurrentIndex(i)
     kapp.connect(self.userinterface.combobox_release_upgrades, SIGNAL("currentIndexChanged(int)"), self.on_combobox_release_upgrades_changed)
 
@@ -395,6 +399,10 @@
   def on_combobox_release_upgrades_changed(self, combobox):
     """ set the release upgrades policy """
     i = self.userinterface.combobox_release_upgrades.currentIndex()
+
+    # FIXME: hack for LP: #944876
+    i = (i - 1) % 3
+
     self.set_release_upgrades_policy(i)
 
   def on_combobox_server_changed(self, combobox):