14254 Export Selections menu is in incorrect status for non-privileged users
14276 PM shouldn't remember the category state if 'Remember current state on exit' is disabled
14671 Typo in error message re: updating live image
--- a/src/gui/modules/installupdate.py Thu Apr 22 13:28:49 2010 +0100
+++ b/src/gui/modules/installupdate.py Thu Apr 22 13:39:33 2010 +0100
@@ -576,7 +576,7 @@
self.__g_error_stage(msg)
return
except api_errors.RebootNeededOnLiveImageException:
- msg = _("The requested operation would affect files that cannot"
+ msg = _("The requested operation would affect files that cannot "
"be modified in the Live Image.\n"
"Please retry this operation on an alternate boot environment.")
self.__g_error_stage(msg)
--- a/src/packagemanager.py Thu Apr 22 13:28:49 2010 +0100
+++ b/src/packagemanager.py Thu Apr 22 13:39:33 2010 +0100
@@ -2763,12 +2763,16 @@
if len(self.search_completion) > 0:
self.cache_o.dump_search_completion_info(
self.search_completion)
- if len(self.category_active_paths) > 0:
- self.cache_o.dump_categories_active_dict(
- self.category_active_paths)
- if len(self.category_expanded_paths) > 0:
- self.cache_o.dump_categories_expanded_dict(
- self.category_expanded_paths)
+ if self.gconf.save_state:
+ if len(self.category_active_paths) > 0:
+ self.cache_o.dump_categories_active_dict(
+ self.category_active_paths)
+ if len(self.category_expanded_paths) > 0:
+ self.cache_o.dump_categories_expanded_dict(
+ self.category_expanded_paths)
+ else:
+ self.cache_o.dump_categories_active_dict({})
+ self.cache_o.dump_categories_expanded_dict({})
self.__shutdown_part2()
return True
@@ -3332,6 +3336,7 @@
self.w_selectall_menuitem.set_sensitive(False)
def __enable_disable_install_remove(self):
+ self.__enable_disable_export_selections()
if not self.user_rights:
self.w_installupdate_button.set_sensitive(False)
self.w_installupdate_menuitem.set_sensitive(False)
@@ -3340,7 +3345,6 @@
return
self.__enable_if_selected_for_removal()
self.__enable_if_selected_for_install_update()
- self.__enable_disable_export_selections()
def __enable_if_selected_for_removal(self):
sensitive = False