Hello community, here is the log from the commit of package yast2-update for openSUSE:Factory checked in at 2015-07-05 17:54:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-update (Old) and /work/SRC/openSUSE:Factory/.yast2-update.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-update" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-update/yast2-update.changes 2015-06-03 08:26:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-update.new/yast2-update.changes 2015-07-05 17:54:21.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jun 29 16:13:30 UTC 2015 - [email protected] + +- UX: add a link to the dependency error message to make the + required user action obvious (bsc#936450) +- 3.1.32 + +------------------------------------------------------------------- Old: ---- yast2-update-3.1.31.tar.bz2 New: ---- yast2-update-3.1.32.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.BUgCKH/_old 2015-07-05 17:54:21.000000000 +0200 +++ /var/tmp/diff_new_pack.BUgCKH/_new 2015-07-05 17:54:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 3.1.31 +Version: 3.1.32 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-update-3.1.31.tar.bz2 -> yast2-update-3.1.32.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.31/package/yast2-update.changes new/yast2-update-3.1.32/package/yast2-update.changes --- old/yast2-update-3.1.31/package/yast2-update.changes 2015-06-01 13:59:21.000000000 +0200 +++ new/yast2-update-3.1.32/package/yast2-update.changes 2015-06-29 18:42:28.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jun 29 16:13:30 UTC 2015 - [email protected] + +- UX: add a link to the dependency error message to make the + required user action obvious (bsc#936450) +- 3.1.32 + +------------------------------------------------------------------- Mon Jun 1 08:43:53 UTC 2015 - [email protected] - make junk_cleaner less aggresive to not remove important files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.31/package/yast2-update.spec new/yast2-update-3.1.32/package/yast2-update.spec --- old/yast2-update-3.1.31/package/yast2-update.spec 2015-06-01 13:59:21.000000000 +0200 +++ new/yast2-update-3.1.32/package/yast2-update.spec 2015-06-29 18:42:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 3.1.31 +Version: 3.1.32 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.31/src/clients/packages_proposal.rb new/yast2-update-3.1.32/src/clients/packages_proposal.rb --- old/yast2-update-3.1.31/src/clients/packages_proposal.rb 2015-06-01 13:59:21.000000000 +0200 +++ new/yast2-update-3.1.32/src/clients/packages_proposal.rb 2015-06-29 18:42:28.000000000 +0200 @@ -28,6 +28,10 @@ # $Id$ module Yast class PackagesProposalClient < Client + include Yast::Logger + + PACKAGER_LINK = "start_packager" + def main Yast.import "Pkg" textdomain "update" @@ -145,10 +149,11 @@ # the proposal for the packages requires manual invervention @ret = { "preformatted_proposal" => HTML.List(@tmp), - # warning text + "links" => [PACKAGER_LINK], + # TRANSLATORS: warning text, keep the HTML tags (<a href...>) untouched "warning" => _( - "Cannot solve all conflicts. Manual intervention is required." - ), + "Cannot solve all conflicts. <a href=\"%s\">Manual intervention is required.</a>" + ) % PACKAGER_LINK, "warning_level" => :blocker } elsif Ops.greater_than(Builtins.size(@warning), 0) @@ -177,16 +182,11 @@ # # sequence = DummyMod::AskUser( has_next ); + # NOTE: we always run the package selector, no need to check the + # @param["chosen_id"] value which determines the link clicked @result = call_packageselector - # FIXME: IT'S A MESS - # if (Pkg::PkgSolve (!Update::onlyUpdateInstalled)) - # Update::solve_errors = 0; - # else - # Update::solve_errors = Pkg::PkgSolveErrors (); - # Fill return map - @ret = { "workflow_sequence" => @result } elsif @func == "Description" # Fill return map. @@ -202,7 +202,8 @@ } end - deep_copy(@ret) + log.info "packages_proposal.rb result: #{@ret.inspect}" + @ret end def call_packageselector @@ -224,7 +225,7 @@ ret end - end + end unless defined?(PackagesProposalClient) end Yast::PackagesProposalClient.new.main
