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# 886662 : ""Abort" button aborts the installation without confirmation" (NEW/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-08-05 13:36:05.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-08-05 15:14:55.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 5 14:48:35 CEST 2014 - locilka@suse.com + +- Fixed handling while aborting an extension license confirmation + (bnc#886662) +- 3.1.97 + +------------------------------------------------------------------- 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:42243 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-registration-3.1.96.tar.bz2 New: ---- yast2-registration-3.1.97.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.5nWBpT/_old 2014-08-06 16:43:24.000000000 +0200 +++ /var/tmp/diff_new_pack.5nWBpT/_new 2014-08-06 16:43:24.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.96 +Version: 3.1.97 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-registration-3.1.96.tar.bz2 -> yast2-registration-3.1.97.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.96/package/yast2-registration.changes new/yast2-registration-3.1.97/package/yast2-registration.changes --- old/yast2-registration-3.1.96/package/yast2-registration.changes 2014-07-30 16:41:00.000000000 +0200 +++ new/yast2-registration-3.1.97/package/yast2-registration.changes 2014-08-05 15:09:42.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Aug 5 14:48:35 CEST 2014 - locilka@suse.com + +- Fixed handling while aborting an extension license confirmation + (bnc#886662) +- 3.1.97 + +------------------------------------------------------------------- Wed Jul 30 14:11:51 UTC 2014 - locilka@suse.com - Asking for confirmation when aborting Extension and Module diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.96/package/yast2-registration.spec new/yast2-registration-3.1.97/package/yast2-registration.spec --- old/yast2-registration-3.1.96/package/yast2-registration.spec 2014-07-30 16:41:00.000000000 +0200 +++ new/yast2-registration-3.1.97/package/yast2-registration.spec 2014-08-05 15:09:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.96 +Version: 3.1.97 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.96/src/lib/registration/ui/addon_eula_dialog.rb new/yast2-registration-3.1.97/src/lib/registration/ui/addon_eula_dialog.rb --- old/yast2-registration-3.1.96/src/lib/registration/ui/addon_eula_dialog.rb 2014-07-30 16:41:00.000000000 +0200 +++ new/yast2-registration-3.1.97/src/lib/registration/ui/addon_eula_dialog.rb 2014-08-05 15:09:42.000000000 +0200 @@ -33,7 +33,7 @@ end # display the EULA for each dialog and wait for a button click - # @return [Symbol] user input (:import, :cancel) + # @return [Symbol] user input (:next, :back, :abort, :halt) def run Yast::Wizard.SetContents( # dialog title @@ -44,26 +44,28 @@ false ) - all_accepted = addons.all? do |addon| + # Default: no EULA specified => accepted + eula_ret = :accepted + + addons.each do |addon| if addon.eula_url && !addon.eula_url.empty? log.info "Addon '#{addon.name}' has an EULA at #{addon.eula_url}" - accept_eula(addon) - else - # no EULA specified => accepted - true + eula_ret = accept_eula(addon) + # any declined license needs to be handled separately + break if eula_ret != :accepted end end - # go back if any EULA has not been accepted, let the user deselect the - # not accepted extension - all_accepted ? :next : :back + # go back or abort if any EULA has not been accepted, let the user + # deselect the not accepted extension + eula_ret == :accepted ? :next : eula_ret end private # ask user to accept an addon EULA # @param addon [SUSE::Connect::Product] the addon - # @return [Boolean] true if the EULA has been accepted + # @return [Symbol] :accepted, :back, :abort, :halt def accept_eula(addon) Dir.mktmpdir("extension-eula-") do |tmpdir| begin @@ -108,9 +110,7 @@ log.debug "EULA dialog result: #{ret}" Yast::ProductLicense.CleanUp() - accepted = ret == :accepted - log.info "EULA accepted: #{accepted}" - accepted + ret end end continue with "q"... Checked in at Wed Aug 6 16:43:36 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