Simple fixes to add context sensitive help to Webinstall, now a target
is available in the delivered help file. Also catches an issue when
failing to open a p5i file.
JR
8141 Webinstall needs context sensitive help
8142 Webinstall crashes when open fails on p5i file
--- a/src/gui/modules/webinstall.py Mon Apr 13 13:16:54 2009 -0700
+++ b/src/gui/modules/webinstall.py Tue Apr 14 12:03:28 2009 +0100
@@ -215,7 +215,7 @@
self.__exit_app()
def __on_help_button_clicked(self, widget):
- gui_misc.display_help(self.application_dir) # Need
target , "webinstall")
+ gui_misc.display_help(self.application_dir, "webinstall")
def __exit_app(self, be_name = None):
self.w_webinstall_dialog.destroy()
@@ -369,6 +369,7 @@
'''<path to mimetype file|origin_url>
returns list of publisher and package list tuples'''
p5i_info = None
+ file_obj = None
if self.param.endswith(".p5i"):
try:
file_obj = open(self.param)
@@ -386,7 +387,8 @@
file_obj.close()
return None
except IOError:
- file_obj.close()
+ if file_obj != None:
+ file_obj.close()
self.w_webinstall_proceed.set_sensitive(False)
msg = _("Error reading the p5i file.")
self.__error_occurred(
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
