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# 870625 : "Build0224: No addon dialog without registration" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-05-13 12:58:01.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-05-14 16:39:54.000000000 +0200 @@ -1,0 +2,7 @@ +Tue May 13 20:12:46 UTC 2014 - lslezak@suse.cz + +- allow adding media addons without registering the base system + (bnc#870625) +- 3.1.52 + +------------------------------------------------------------------- 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:37888 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-registration-3.1.51.tar.bz2 New: ---- yast2-registration-3.1.52.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.Ak5eeE/_old 2014-05-14 17:51:24.000000000 +0200 +++ /var/tmp/diff_new_pack.Ak5eeE/_new 2014-05-14 17:51:24.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.51 +Version: 3.1.52 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -33,6 +33,8 @@ Requires: yast2-ruby-bindings >= 3.1.12 Requires: rubygem-suse-connect Requires: yast2-slp >= 3.1.2 +Requires: yast2-addon >= 3.1.3 +Requires: yast2-packager >= 3.1.14 BuildRequires: yast2 >= 3.1.26 BuildRequires: update-desktop-files @@ -40,6 +42,7 @@ BuildRequires: rubygem-rspec BuildRequires: rubygem-suse-connect BuildRequires: yast2-slp >= 3.1.2 +BuildRequires: yast2-packager >= 3.1.14 BuildArch: noarch ++++++ yast2-registration-3.1.51.tar.bz2 -> yast2-registration-3.1.52.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.51/package/yast2-registration.changes new/yast2-registration-3.1.52/package/yast2-registration.changes --- old/yast2-registration-3.1.51/package/yast2-registration.changes 2014-05-12 15:51:08.000000000 +0200 +++ new/yast2-registration-3.1.52/package/yast2-registration.changes 2014-05-14 16:37:48.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue May 13 20:12:46 UTC 2014 - lslezak@suse.cz + +- allow adding media addons without registering the base system + (bnc#870625) +- 3.1.52 + +------------------------------------------------------------------- Mon May 12 13:35:09 UTC 2014 - lslezak@suse.cz - use "modules" term as well (bnc#875199#c10) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.51/package/yast2-registration.spec new/yast2-registration-3.1.52/package/yast2-registration.spec --- old/yast2-registration-3.1.51/package/yast2-registration.spec 2014-05-12 15:51:08.000000000 +0200 +++ new/yast2-registration-3.1.52/package/yast2-registration.spec 2014-05-14 16:37:48.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.51 +Version: 3.1.52 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -33,6 +33,8 @@ Requires: yast2-ruby-bindings >= 3.1.12 Requires: rubygem-suse-connect Requires: yast2-slp >= 3.1.2 +Requires: yast2-addon >= 3.1.3 +Requires: yast2-packager >= 3.1.14 BuildRequires: yast2 >= 3.1.26 BuildRequires: update-desktop-files @@ -40,6 +42,7 @@ BuildRequires: rubygem-rspec BuildRequires: rubygem-suse-connect BuildRequires: yast2-slp >= 3.1.2 +BuildRequires: yast2-packager >= 3.1.14 BuildArch: noarch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.51/src/clients/inst_scc.rb new/yast2-registration-3.1.52/src/clients/inst_scc.rb --- old/yast2-registration-3.1.51/src/clients/inst_scc.rb 2014-05-12 15:51:08.000000000 +0200 +++ new/yast2-registration-3.1.52/src/clients/inst_scc.rb 2014-05-14 16:37:48.000000000 +0200 @@ -64,6 +64,7 @@ Yast.import "Sequencer" Yast.import "Installation" Yast.import "ProductControl" + Yast.import "SourceDialogs" @selected_addons = ::Registration::Storage::InstallationOptions.instance.selected_addons @@ -291,21 +292,6 @@ # create content fot the addon selection dialog def addon_selection_dialog_content(addons) - media_checkbox = Empty() - - # the media check box is displayed only at installation - # to modify the installation workflow (display extra add-on dialog) - if Mode.installation - media_checkbox = VBox( - VSpacing(0.4), - HBox( - HSpacing(1), - Left(CheckBox(Id(:media), _("In&clude Extensions from Separate Media"), - Installation.add_on_selected)), - ) - ) - end - # less lines in textmode to fit 80x25 size lines = UI.TextMode ? 9 : 14 @@ -332,8 +318,6 @@ VWeight(25, RichText(Id(:details), Opt(:disabled), "<small>" + _("Select an extension or a module to show details here") + "</small>")), ), - media_checkbox, - VSpacing(0.4), VStretch() ) end @@ -377,21 +361,6 @@ return true end - # read the addon media checkbox and adapt the installation workflow accordingly - def set_media_addons - if Mode.installation - # the widget exists only at installation - Installation.add_on_selected = UI.QueryWidget(Id(:media), :Value) - log.info "Add-on media selected: #{Installation.add_on_selected}" - - # lazy include, the file is part of yast2-installation - # avoid yast2-installation runtime dependency by including it only here, - # not at the global level - Yast.include self, "installation/misc.rb" - AdjustStepsAccordingToInstallationSettings() - end - end - # handle user input in the addon selection dialog def handle_addon_selection_dialog(addons) ret = nil @@ -416,8 +385,6 @@ ::Registration::Storage::InstallationOptions.instance.selected_addons = @selected_addons log.info "Selected addons: #{@selected_addons.map(&:short_name)}" - set_media_addons - ret = :skip if @selected_addons.empty? else # check whether it's an add-on ID (checkbox clicked) @@ -442,11 +409,8 @@ # dialog title _("Extension Selection"), addon_selection_dialog_content(addons), - # help text for add-ons installation, %s is URL - _("<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", + # TODO FIXME: add a help text + "", GetInstArgs.enable_back || Mode.normal, GetInstArgs.enable_next || Mode.normal ) @@ -652,12 +616,15 @@ end def media_addons - if Installation.add_on_selected - # start the next step (add-on media selection) - ProductControl.RunFrom(ProductControl.CurrentStep + 1, false) - else - :next - end + # force displaying the UI + Installation.add_on_selected = true + # display global enable/disable switch + SourceDialogs.display_addon_checkbox = true + + WFM.call("inst_add-on") + ensure + # make sure to revert the change if something goes wrong + SourceDialogs.display_addon_checkbox = false end def registered_dialog @@ -736,7 +703,7 @@ "register" => { :abort => :abort, :cancel => :abort, - :skip => :next, + :skip => "media_addons", :next => "select_addons" }, "select_addons" => { @@ -750,7 +717,8 @@ }, "media_addons" => { :abort => :abort, - :next => :next + :next => :next, + :auto => :auto } } continue with "q"... Checked in at Wed May 14 17:51:32 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org