Mailinglist Archive: yast-commit (1088 mails)

< Previous Next >
[yast-commit] [ci_new_pac] JFYI yast2-registration -> sle12
Script 'mail_helper' called by ro
Hello packager,

This is just FYI. Your package was checked in in distribution "sle12"
by autobuild-member: ro.

Here comes the log...

---------------------------%<------------------------------
Hi,

here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-registration
-> sle12



## BNC# 875199 : "[UX] Extension selection screen mixes 'Extension' and
'Module' and 'Add-on Products' with no explanation" (RESOLVED/FIXED)
## BNC# 876328 : "Allow to register additional extension in installed system"
(RESOLVED/FIXED)

Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes
2014-05-07 16:46:08.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes
2014-05-12 15:53:39.000000000 +0200
@@ -1,0 +2,17 @@
+Mon May 12 13:35:09 UTC 2014 - lslezak@xxxxxxx
+
+- use "modules" term as well (bnc#875199#c10)
+- 3.1.51
+
+-------------------------------------------------------------------
+Fri May 9 12:27:20 UTC 2014 - lslezak@xxxxxxx
+
+- remember registered extensions, do not register them again
+ and disable the checkboxes (extensions cannot be "unregistered")
+- display registered status in the main dialog
+- use "extension" term consistently (bnc#875199)
+- allow registering extensions in installed system without
+ re-registering the base product (bnc#876328)
+- 3.1.50
+
+-------------------------------------------------------------------

calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-registration
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-registration (Old)
and /mounts/work_src_done/SLE12/yast2-registration (BS:build ID:37754
MAIL:yast-commit@xxxxxxxxxxxx) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-registration", Maintainer is "yast-commit@xxxxxxxxxxxx"


Old:
----
yast2-registration-3.1.49.tar.bz2

New:
----
yast2-registration-3.1.51.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.ZoySEV/_old 2014-05-13 12:57:09.000000000 +0200
+++ /var/tmp/diff_new_pack.ZoySEV/_new 2014-05-13 12:57:09.000000000 +0200
@@ -17,7 +17,7 @@


Name: yast2-registration
-Version: 3.1.49
+Version: 3.1.51
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build

++++++ yast2-registration-3.1.49.tar.bz2 -> yast2-registration-3.1.51.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-3.1.49/package/yast2-registration.changes
new/yast2-registration-3.1.51/package/yast2-registration.changes
--- old/yast2-registration-3.1.49/package/yast2-registration.changes
2014-05-07 15:25:41.000000000 +0200
+++ new/yast2-registration-3.1.51/package/yast2-registration.changes
2014-05-12 15:51:08.000000000 +0200
@@ -1,4 +1,21 @@
-------------------------------------------------------------------
+Mon May 12 13:35:09 UTC 2014 - lslezak@xxxxxxx
+
+- use "modules" term as well (bnc#875199#c10)
+- 3.1.51
+
+-------------------------------------------------------------------
+Fri May 9 12:27:20 UTC 2014 - lslezak@xxxxxxx
+
+- remember registered extensions, do not register them again
+ and disable the checkboxes (extensions cannot be "unregistered")
+- display registered status in the main dialog
+- use "extension" term consistently (bnc#875199)
+- allow registering extensions in installed system without
+ re-registering the base product (bnc#876328)
+- 3.1.50
+
+-------------------------------------------------------------------
Wed May 7 13:17:23 UTC 2014 - lslezak@xxxxxxx

- Save the repository credentials to /mnt during upgrade (libzypp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-3.1.49/package/yast2-registration.spec
new/yast2-registration-3.1.51/package/yast2-registration.spec
--- old/yast2-registration-3.1.49/package/yast2-registration.spec
2014-05-07 15:25:41.000000000 +0200
+++ new/yast2-registration-3.1.51/package/yast2-registration.spec
2014-05-12 15:51:08.000000000 +0200
@@ -17,7 +17,7 @@


Name: yast2-registration
-Version: 3.1.49
+Version: 3.1.51
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-registration-3.1.49/src/clients/inst_scc.rb
new/yast2-registration-3.1.51/src/clients/inst_scc.rb
--- old/yast2-registration-3.1.49/src/clients/inst_scc.rb 2014-05-07
15:25:41.000000000 +0200
+++ new/yast2-registration-3.1.51/src/clients/inst_scc.rb 2014-05-12
15:51:08.000000000 +0200
@@ -144,9 +144,6 @@

base_product["reg_code"] = reg_code
registered_services =
@registration.register_product(base_product)
-
- # remember the base products for later (to get the respective
addons)
- ::Registration::Storage::BaseProduct.instance.product =
base_product
options.base_registered = true

registered_services
@@ -182,14 +179,16 @@

if !Mode.normal
# add a paragraph separator
- info << "\n\n"
+ info += "\n\n"

# label text describing the registration (2/2),
# not displayed in installed system
# use \n to split to more lines if needed (use max. 76 chars/line)
- info << _("If you skip the registration now be sure to do so in the
installed system.")
+ info += _("If you skip the registration now be sure to do so in the
installed system.")
end

+ registered = ::Registration::Registration.is_registered?
+
VBox(
Mode.installation ?
Right(PushButton(Id(:network), _("Network Configuration..."))) :
@@ -200,7 +199,9 @@
VSpacing(1),

Left(Heading(::Registration::SwMgmt.base_product_label(base_product))),
VSpacing(1),
- Label(info)
+ registered ?
+ Heading(_("The system is already registered.")) :
+ Label(info)
)
),
VSpacing(UI.TextMode ? 1 : 2),
@@ -212,7 +213,7 @@
)
),
VSpacing(UI.TextMode ? 1 : 3),
- Mode.normal ? Empty() : PushButton(Id(:skip), _("&Skip Registration")),
+ registered ? Empty() : PushButton(Id(:skip), _("&Skip Registration")),
VStretch()
)
end
@@ -276,8 +277,10 @@
label = addon.short_name
label << " (#{addon.long_name})" if addon.long_name &&
!addon.long_name.empty?

- box.params << Left(CheckBox(Id(addon.product_ident), Opt(:notify),
- addon.short_name, @selected_addons.include?(addon)))
+ box.params << Left(CheckBox(Id(addon.product_ident),
+ Opt(:notify),
+ addon.short_name,
+ @selected_addons.include?(addon) ||
registered_addons.include?(addon.product_ident)))

# add extra spacing when there are just few addons, in GUI always
box.params << VSpacing(0.7) if add_extra_spacing
@@ -297,7 +300,7 @@
VSpacing(0.4),
HBox(
HSpacing(1),
- Left(CheckBox(Id(:media), _("In&clude Add-on Products from
Separate Media"),
+ Left(CheckBox(Id(:media), _("In&clude Extensions from Separate
Media"),
Installation.add_on_selected)),
)
)
@@ -319,7 +322,7 @@

VBox(
VStretch(),
- Left(Heading(_("Available Extensions"))),
+ Left(Heading(_("Available Extensions and Modules"))),
VWeight(75, MarginBox(2, 1, HBox(
vbox1,
vbox2
@@ -327,7 +330,7 @@
Left(Label(_("Details"))),
MinHeight(8,
VWeight(25, RichText(Id(:details), Opt(:disabled), "<small>" +
- _("Select an addon to show details here") + "</small>")),
+ _("Select an extension or a module to show details here") +
"</small>")),
),
media_checkbox,
VSpacing(0.4),
@@ -401,6 +404,9 @@
when :next
selected = addons.select{|a| UI.QueryWidget(Id(a.product_ident),
:Value)}

+ # ignore already registered addons
+ selected.reject!{|a| registered_addons.include?(a.product_ident) }
+
if !supported_addon_count(selected)
ret = nil
next
@@ -437,14 +443,19 @@
_("Extension Selection"),
addon_selection_dialog_content(addons),
# help text for add-ons installation, %s is URL
- _("<p>\nTo install an add-on product from separate media together with
&product;, select\n" +
- "<b>Include Add-on Products from Separate Media</b>.</p>\n" +
+ _("<p>\nTo install an extension or a module from separate media
together with the product, select\n" +
+ "<b>Include Extensions from Separate Media</b>.</p>\n" +
"<p>If you need specific hardware drivers for installation, see
<i>%s</i> site.</p>") %
"http://drivers.suse.com";,
GetInstArgs.enable_back || Mode.normal,
GetInstArgs.enable_next || Mode.normal
)

+ # disable already registered addons in UI
+ registered_addons.each do |addon|
+ UI.ChangeWidget(Id(addon), :Enabled, false)
+ end
+
handle_addon_selection_dialog(addons)
end

@@ -502,6 +513,8 @@
@available_addons =
::Registration::Storage::Cache.instance.available_addons
return @available_addons if @available_addons

+ init_registration
+
@available_addons = Popup.Feedback(
_(CONTACTING_MESSAGE),
_("Loading Available Add-on Products and Extensions...")) do
@@ -582,6 +595,10 @@

# select repositories to use in installation (e.g. enable/disable
Updates)
select_repositories(product_service) if Mode.installation
+
+ # move from selected to registered
+ registered_addons << product.product_ident
+ @selected_addons.reject!{|selected| selected.product_ident ==
product.product_ident}
end
end

@@ -597,7 +614,7 @@
if missing_regcodes.empty?
Wizard.SetContents(
# dialog title
- _("Registering Selected Add-on Products and Extensions"),
+ _("Register Extensions and Modules"),
# display only the products which need a registration code
Empty(),
# FIXME: help text
@@ -610,7 +627,7 @@
else
Wizard.SetContents(
# dialog title
- _("Enter Registration Codes for Selected Add-on Products and
Extensions"),
+ _("Extension and Module Registration Codes"),
# display only the products which need a registration code
addon_regcodes_dialog_content(missing_regcodes),
# FIXME: help text
@@ -646,8 +663,12 @@
def registered_dialog
VBox(
Heading(_("The system is already registered.")),
+ VSpacing(2),
+ # button label
+ PushButton(Id(:register), _("Register Again")),
VSpacing(1),
- PushButton(Id(:register), _("Register Again"))
+ # button label
+ PushButton(Id(:extensions), _("Select Extensions"))
)
end

@@ -664,7 +685,7 @@

Wizard.SetNextButton(:next, Label.FinishButton) if Mode.normal

- continue_buttons = [:next, :back, :cancel, :abort, :register]
+ continue_buttons = [:next, :back, :cancel, :abort, :register,
:extensions]

ret = nil
while !continue_buttons.include?(ret) do
@@ -705,11 +726,12 @@
sequence = {
"ws_start" => "check",
"check" => {
- :auto => :auto,
- :abort => :abort,
- :cancel => :abort,
- :register => "register",
- :next => :next
+ :auto => :auto,
+ :abort => :abort,
+ :cancel => :abort,
+ :register => "register",
+ :extensions => "select_addons",
+ :next => :next
},
"register" => {
:abort => :abort,
@@ -737,8 +759,15 @@
end

def init_registration
- url = ::Registration::Helpers.registration_url
- @registration = ::Registration::Registration.new(url)
+ if !@registration
+ url = ::Registration::Helpers.registration_url
+ @registration = ::Registration::Registration.new(url)
+ end
+ end
+
+ # helper method for accessing the registered addons
+ def registered_addons
+ ::Registration::Storage::Cache.instance.registered_addons
end

end unless defined?(InstSccClient)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-registration-3.1.49/src/clients/scc_auto.rb
new/yast2-registration-3.1.51/src/clients/scc_auto.rb
--- old/yast2-registration-3.1.49/src/clients/scc_auto.rb 2014-05-07
15:25:41.000000000 +0200
+++ new/yast2-registration-3.1.51/src/clients/scc_auto.rb 2014-05-12
15:51:08.000000000 +0200
@@ -348,12 +348,12 @@
def configure_registration
caption = _("Product Registration")
help_text = "<p><b>#{caption}</b></p>"
- help_text << _(
+ help_text += _(
"<p>Product registration includes your product in SUSE Customer Center
database,\n"+
"enabling you to get online updates and technical support.\n"+
"To register while installing automatically, select <b>Run Product
Registration</b>.</p>"
)
- help_text << _(
+ help_text += _(
"<p>If your network deploys a custom registration server, set the
correct URL of the server\n" +
"and the location of the SMT certificate in <b>SMT Server
Settings</b>. Refer\n" +
"to your SMT manual for further assistance.</p>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-3.1.49/src/lib/registration/registration.rb
new/yast2-registration-3.1.51/src/lib/registration/registration.rb
--- old/yast2-registration-3.1.49/src/lib/registration/registration.rb
2014-05-07 15:25:41.000000000 +0200
+++ new/yast2-registration-3.1.51/src/lib/registration/registration.rb
2014-05-12 15:51:08.000000000 +0200
@@ -86,7 +86,7 @@

def get_addon_list
# extensions for base product
- base_product = ::Registration::Storage::BaseProduct.instance.product
+ base_product = ::Registration::SwMgmt.find_base_product
params = connect_params(:product_ident => {:name =>
base_product["name"]})

log.info "Reading available addons for product: #{base_product["name"]}"
@@ -110,7 +110,7 @@
:verify_callback => lambda do |verify_ok, context|
# we cannot raise an exception with details here (all exceptions in
# verify_callback are caught and ignored), we need to store the error
- # details is a global instance
+ # details in a global instance
if !verify_ok
log.error "SSL verification failed: #{context.error}:
#{context.error_string}"
Storage::SSLErrors.instance.ssl_error_code = context.error
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-3.1.49/src/lib/registration/storage.rb
new/yast2-registration-3.1.51/src/lib/registration/storage.rb
--- old/yast2-registration-3.1.49/src/lib/registration/storage.rb
2014-05-07 15:25:41.000000000 +0200
+++ new/yast2-registration-3.1.51/src/lib/registration/storage.rb
2014-05-12 15:51:08.000000000 +0200
@@ -34,11 +34,6 @@
include Singleton
end

- # remember the registered base product
- class BaseProduct < Struct.new(:product)
- include Singleton
- end
-
# remember the values entered by user
class InstallationOptions
include Singleton
@@ -53,12 +48,19 @@
end
end

- class Cache < Struct.new(:available_addons, :reg_url, :reg_url_cached)
+ class Cache < Struct.new(:available_addons, :registered_addons,
+ :reg_url, :reg_url_cached)
+
include Singleton
+
+ def initialize
+ # TODO: handle registered addons in installed system
+ self.registered_addons = []
+ end
end

# remember the details about SSL verification failure
- # the attributes are read from
+ # the attributes are read from the SSL error context
class SSLErrors < Struct.new(:ssl_error_code, :ssl_error_msg,
:ssl_failed_cert)
include Singleton


continue with "q"...


Checked in at Tue May 13 12:58:02 CEST 2014 by ro

Remember to have fun...

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread