[yast-commit] [ci_new_pac] JFYI yast2-packager -> 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-packager -> sle12 ## BNC# 886662 : ""Abort" button aborts the installation without confirmation" (NEW/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-packager/yast2-packager.changes 2014-07-31 13:37:40.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-packager/yast2-packager.changes 2014-07-31 15:49:13.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 31 14:43:16 CEST 2014 - locilka@suse.com + +- Added user confirmation for aborting the repositories dialogs + (bnc#886662) +- 3.1.38 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-packager - at least 26 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-packager (Old) and /mounts/work_src_done/SLE12/yast2-packager (BS:build ID:42085 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-packager", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-packager-3.1.37.tar.bz2 New: ---- yast2-packager-3.1.38.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.D88fdy/_old 2014-08-05 13:34:52.000000000 +0200 +++ /var/tmp/diff_new_pack.D88fdy/_new 2014-08-05 13:34:52.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.37 +Version: 3.1.38 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-packager-3.1.37.tar.bz2 -> yast2-packager-3.1.38.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.37/package/yast2-packager.changes new/yast2-packager-3.1.38/package/yast2-packager.changes --- old/yast2-packager-3.1.37/package/yast2-packager.changes 2014-07-31 13:24:55.000000000 +0200 +++ new/yast2-packager-3.1.38/package/yast2-packager.changes 2014-07-31 15:44:53.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jul 31 14:43:16 CEST 2014 - locilka@suse.com + +- Added user confirmation for aborting the repositories dialogs + (bnc#886662) +- 3.1.38 + +------------------------------------------------------------------- Thu Jul 31 11:18:09 UTC 2014 - jsrain@suse.cz - added product rename sle-hae -> sle-ha to the list (bnc#889745) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.37/package/yast2-packager.spec new/yast2-packager-3.1.38/package/yast2-packager.spec --- old/yast2-packager-3.1.37/package/yast2-packager.spec 2014-07-31 13:24:55.000000000 +0200 +++ new/yast2-packager-3.1.38/package/yast2-packager.spec 2014-07-31 15:44:53.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.37 +Version: 3.1.38 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.37/src/modules/SourceDialogs.rb new/yast2-packager-3.1.38/src/modules/SourceDialogs.rb --- old/yast2-packager-3.1.37/src/modules/SourceDialogs.rb 2014-07-31 13:24:55.000000000 +0200 +++ new/yast2-packager-3.1.38/src/modules/SourceDialogs.rb 2014-07-31 15:44:53.000000000 +0200 @@ -77,6 +77,7 @@ Yast.import "IP" Yast.import "ProductControl" Yast.import "ProductFeatures" + Yast.import "Stage" # common functions / data @@ -112,6 +113,11 @@ "<p>If the repository is on multiple media,\nset the location of the first media of the set.</p>\n" ) + # Belongs to a constant, but can't be there because of `fun_ref` + @default_cwm_fallback_functions = { + :abort => fun_ref(method(:confirm_abort?), "boolean ()") + } + # NFS editation widget @nfs_details_content = VBox( @@ -1956,6 +1962,7 @@ @display_addon_checkbox ? HSpacing(3) : Empty() end + # FIXME: two almost same definitions in the same function smell bad def SelectRadioWidgetOpt(download_widget) contents = HBox( HStretch(), @@ -2142,25 +2149,27 @@ true end + # Handles Ui events in New repository type selection dialog + # + # @param [String] widget key + # @param [Hash] event description + # @return [Symbol] def SelectHandle(key, event) - event = deep_copy(event) - # reset the preselected URL when going back - @_url = "" if Ops.get(event, "ID") == :back - - if !(Ops.get(event, "ID") == :next || Ops.get(event, "ID") == :ok) - RefreshTypeWidgets() if event["ID"] == :add_addon + case event["ID"] + when :back + # reset the preselected URL when going back + @_url = "" + when :next, :ok + return nil + when :add_addon + RefreshTypeWidgets() return nil end - selected = Convert.to_symbol(UI.QueryWidget(Id(:type), :CurrentButton)) - # TODO: disable "download" option when CD or DVD source is selected - return nil if selected == nil - if selected == :slp || selected == :cd || selected == :dvd || - selected == :comm_repos - return :finish - end + selected = UI.QueryWidget(Id(:type), :CurrentButton) + return :finish if [:slp, :cd, :dvd, :comm_repos].include?(selected) nil end @@ -2494,7 +2503,7 @@ "caption" => caption, "back_button" => Label.BackButton, "next_button" => Label.NextButton, - "fallback_functions" => {} + "fallback_functions" => @default_cwm_fallback_functions, } ) end @@ -2515,7 +2524,7 @@ "caption" => caption, "back_button" => Label.BackButton, "next_button" => Label.NextButton, - "fallback_functions" => {} + "fallback_functions" => @default_cwm_fallback_functions, } ) end @@ -2558,7 +2567,7 @@ "caption" => caption, "back_button" => Label.BackButton, "next_button" => Label.NextButton, - "fallback_functions" => {} + "fallback_functions" => @default_cwm_fallback_functions, } ) Builtins.y2milestone("Type dialog returned %1", ret) @@ -2582,7 +2591,7 @@ "caption" => caption, "back_button" => Label.BackButton, "next_button" => Label.NextButton, - "fallback_functions" => {} + "fallback_functions" => @default_cwm_fallback_functions, } ) @@ -2592,6 +2601,13 @@ deep_copy(ret) end + # Returns boolean whether user confirmed to abort the configuration + # + # @return [Boolean] whether to abort + def confirm_abort? + (Stage.initial ? Popup.ConfirmAbort(:painless) : Popup.ReallyAbort(SourceManager.Modified())) + end + publish :function => :SetURL, :type => "void (string)" publish :function => :SetURLType, :type => "void (string, boolean)" publish :function => :GetURL, :type => "string ()" continue with "q"... Checked in at Tue Aug 5 13:34:59 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
participants (1)
-
ro