7104247 Remove platform exclude dependencies in Solaris 11 Express SRU
7104266 packagemanager stack traces should tell customers to report issues to service
--- a/src/modules/gui/globalexceptionhandler.py Thu Oct 20 16:54:12 2011 -0700
+++ b/src/modules/gui/globalexceptionhandler.py Mon Oct 24 09:33:16 2011 -0700
@@ -19,7 +19,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
#
import sys
@@ -111,19 +111,12 @@
close_btn = md.add_button(gtk.STOCK_CLOSE, 100)
md.set_default_response(100)
- dmsg = _("Please let the developers know about this problem by "
- "filing a bug together with the error details listed below at:")
+ dmsg = misc.get_traceback_message()
+ # We remove all \n except the initial one.
+ dmsg = "\n" + dmsg.replace("\n", " ").lstrip()
md.format_secondary_text(dmsg)
md.set_title(_('Unexpected Error'))
- uri_btn = gtk.LinkButton(misc.BUG_URI_GUI,
- "defect.opensolaris.org")
- uri_btn.set_relief(gtk.RELIEF_NONE)
- uri_btn.set_size_request(160, -1)
- align = gtk.Alignment(0, 0, 0, 0)
- align.set_padding(0, 0, 56, 0)
- align.add(uri_btn)
-
textview = gtk.TextView()
textview.show()
textview.set_editable(False)
@@ -136,7 +129,6 @@
fr.set_shadow_type(gtk.SHADOW_IN)
fr.add(sw)
ca = md.get_content_area()
- ca.pack_start(align, False, False, 0)
ca.pack_start(fr)
textbuffer = textview.get_buffer()
@@ -162,10 +154,6 @@
_("\nPlease include output from:\n"), "bold")
textbuffer.insert(textiter, "$ pkg publisher\n")
- ver = gui_misc.get_version()
- textbuffer.insert_with_tags_by_name(textiter,
- _("\npkg version:\n"), "bold")
- textbuffer.insert_with_tags_by_name(textiter, ver + "\n", "level1")
md.set_size_request(550, 400)
md.set_resizable(True)
close_btn.grab_focus()
--- a/src/modules/gui/installupdate.py Thu Oct 20 16:54:12 2011 -0700
+++ b/src/modules/gui/installupdate.py Mon Oct 24 09:33:16 2011 -0700
@@ -823,10 +823,6 @@
msg = _("Specifying BE Name not supported.\n")
self.__g_error_stage(msg)
return
- except api_errors.ApiException, ex:
- msg = str(ex)
- self.__g_error_stage(msg)
- return
# We do want to prompt user to load BE admin if there is
# not enough disk space. This error can either come as an
# error within API exception, see bug #7642 or as a standalone
@@ -844,6 +840,10 @@
else:
self.__handle_error()
return
+ except api_errors.ApiException, ex:
+ msg = str(ex)
+ self.__g_error_stage(msg)
+ return
except Exception:
self.__handle_error()
return
@@ -1185,14 +1185,12 @@
gobject.idle_add(self.current_stage_label.set_markup, txt)
gobject.idle_add(self.current_stage_icon.set_from_stock,
gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_MENU)
- msg_1 = _("An unknown error occurred in the %s stage.\n"
- "Please let the developers know about this problem by "
- "filing a bug together with the error details listed below at:\n"
- ) % self.current_stage_name
- msg_2 = "%s\n\n" % misc.BUG_URI_GUI
+ msg_2 = misc.get_traceback_message()
+ msg_2 = msg_2.replace("\n", " ").lstrip()
+ msg_1 = _("An unknown error occurred in the %s stage.\n\n")\
+ % self.current_stage_name + msg_2
self.update_details_text(_("\nError:\n"), "bold")
- self.update_details_text("%s" % msg_1, "level1")
- self.update_details_text("%s" % msg_2, "bold", "level2")
+ self.update_details_text("%s\n\n" % msg_1, "level1")
if tracebk:
msg = _("Exception traceback:\n")
self.update_details_text("%s" % msg,
@@ -1201,10 +1199,6 @@
else:
msg = _("No futher information available")
self.update_details_text("%s\n" % msg, "level2")
- msg_3 = _("pkg version: ")
- self.update_details_text("%s" % msg_3,
- "bold","level1")
- self.update_details_text("%s\n\n" % gui_misc.get_version(), "level2")
publisher_header = _("List of configured publishers:")
self.update_details_text("%s" % publisher_header,
"bold","level1")
--- a/src/pkg/manifests/consolidation:ips:ips-incorporation.p5m Thu Oct 20 16:54:12 2011 -0700
+++ b/src/pkg/manifests/consolidation:ips:ips-incorporation.p5m Mon Oct 24 09:33:16 2011 -0700
@@ -28,7 +28,8 @@
set name=pkg.depend.install-hold value=core-os.ips
set name=com.oracle.service.bugid \
last-fmri=consolidation/ips/[email protected],5.11-0.151.0.1.7:20110526T000209Z \
- value=7098585 value=7101660 value=7101910
+ value=7098585 value=7101660 value=7102984 value=7102987 value=7104247 \
+ value=7104266
set name=info.classification \
value=org.opensolaris.category.2008:System/Packaging
--- a/src/pkg/manifests/developer:opensolaris:pkg5.p5m Thu Oct 20 16:54:12 2011 -0700
+++ b/src/pkg/manifests/developer:opensolaris:pkg5.p5m Mon Oct 24 09:33:16 2011 -0700
@@ -27,7 +27,8 @@
value="This package should be installed on systems used for development of the pkg(5) project"
set name=com.oracle.service.bugid \
last-fmri=developer/opensolaris/[email protected],5.11-0.151.0.1:20101104T231611Z \
- value=7098585 value=7101660
+ value=7098585 value=7101660 value=7102984 value=7102987 value=7104247 \
+ value=7104266
set name=info.classification \
value="org.opensolaris.category.2008:Development/Distribution Tools"
depend type=require fmri=pkg:/developer/build/make
--- a/src/pkg/manifests/package:pkg.p5m Thu Oct 20 16:54:12 2011 -0700
+++ b/src/pkg/manifests/package:pkg.p5m Mon Oct 24 09:33:16 2011 -0700
@@ -30,7 +30,8 @@
set name=pkg.linted.pkglint.manifest003.1 value=true
set name=com.oracle.service.bugid \
last-fmri=package/[email protected],5.11-0.151.0.1.7:20110526T000204Z \
- value=7098585 value=7101660 value=7102984 value=7102987
+ value=7098585 value=7101660 value=7102984 value=7102987 value=7104247 \
+ value=7104266
set name=info.classification \
value=org.opensolaris.category.2008:System/Packaging
set name=variant.arch value=$(ARCH)
@@ -347,10 +348,6 @@
license cr_Oracle license=cr_Oracle
license lic_gustaebel license=lic_gustaebel
license lic_minisat license=lic_minisat
-depend type=exclude fmri=system/platform/exadata/firstrun \
- facet.exclude.exadata-firstrun=true
-depend type=exclude fmri=system/platform/exalogic/firstrun \
- facet.exclude.exalogic-firstrun=true
depend type=optional fmri=install/[email protected],5.11-0.151.0.1.13
depend type=optional fmri=package/pkg/package-manager@$(PKGVERS)
depend type=optional fmri=package/pkg/update-manager@$(PKGVERS)
--- a/src/pkg/manifests/package:pkg:package-manager.p5m Thu Oct 20 16:54:12 2011 -0700
+++ b/src/pkg/manifests/package:pkg:package-manager.p5m Mon Oct 24 09:33:16 2011 -0700
@@ -27,7 +27,8 @@
value="The graphical interface for the Image Packaging System allows you to perform many core packaging tasks in a user-friendly fashion."
set name=com.oracle.service.bugid \
last-fmri=package/pkg/[email protected],5.11-0.151.0.1:20101104T233550Z \
- value=7098585 value=7101660 value=7102984
+ value=7098585 value=7101660 value=7102984 value=7102987 value=7104247 \
+ value=7104266
set name=info.classification \
value=org.opensolaris.category.2008:System/Packaging
set name=variant.arch value=$(ARCH)
--- a/src/pkg/manifests/package:pkg:update-manager.p5m Thu Oct 20 16:54:12 2011 -0700
+++ b/src/pkg/manifests/package:pkg:update-manager.p5m Mon Oct 24 09:33:16 2011 -0700
@@ -30,7 +30,8 @@
set name=pkg.linted.pkglint.manifest003.1 value=true
set name=com.oracle.service.bugid \
last-fmri=package/pkg/[email protected],5.11-0.151.0.1:20101104T233552Z \
- value=7098585 value=7101660 value=7102984
+ value=7098585 value=7101660 value=7102984 value=7102987 value=7104247 \
+ value=7104266
set name=info.classification \
value=org.opensolaris.category.2008:System/Packaging
set name=variant.arch value=$(ARCH)
--- a/src/pkg/manifests/system:trusted:trusted-nonglobal.p5m Thu Oct 20 16:54:12 2011 -0700
+++ b/src/pkg/manifests/system:trusted:trusted-nonglobal.p5m Mon Oct 24 09:33:16 2011 -0700
@@ -27,7 +27,8 @@
value="This package delivers the dependencies needed to install a Trusted Extensions labeled zone"
set name=com.oracle.service.bugid \
last-fmri=system/trusted/[email protected],5.11-0.151.0.1:20101105T005729Z \
- value=7098585 value=7101660
+ value=7098585 value=7101660 value=7102984 value=7102987 value=7104247 \
+ value=7104266
set name=info.classification value=org.opensolaris.category.2008:System/Trusted
depend type=require fmri=pkg:/communication/im/pidgin
depend type=require fmri=pkg:/desktop/administration/gnome-system-tools
--- a/src/pkg/manifests/system:zones:brand:ipkg.p5m Thu Oct 20 16:54:12 2011 -0700
+++ b/src/pkg/manifests/system:zones:brand:ipkg.p5m Mon Oct 24 09:33:16 2011 -0700
@@ -27,7 +27,8 @@
value="A branded zone whose software is managed using the Image Packaging System"
set name=com.oracle.service.bugid \
last-fmri=system/zones/brand/[email protected],5.11-0.151.0.1.2:20110127T224018Z \
- value=7098585 value=7101660 value=7102984
+ value=7098585 value=7101660 value=7102984 value=7102987 value=7104247 \
+ value=7104266
set name=info.classification \
value=org.opensolaris.category.2008:System/Packaging
set name=variant.arch value=$(ARCH)