Hello community, here is the log from the commit of package yast2-update for openSUSE:Factory checked in at 2015-05-19 23:24:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-02-12 10:21:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-update.new/yast2-update.changes 2015-05-19 23:24:28.000000000 +0200 @@ -1,0 +2,7 @@ +Mon May 18 14:42:15 UTC 2015 - [email protected] + +- sort patterns in the upgrade summary to have stable output for + openQA tests (bsc#931295), escape the HTML tags +- 3.1.28 + +------------------------------------------------------------------- Old: ---- yast2-update-3.1.27.tar.bz2 New: ---- yast2-update-3.1.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.SJQwzF/_old 2015-05-19 23:24:29.000000000 +0200 +++ /var/tmp/diff_new_pack.SJQwzF/_new 2015-05-19 23:24:29.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-update # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-update -Version: 3.1.27 +Version: 3.1.28 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-update-3.1.27.tar.bz2 -> yast2-update-3.1.28.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.27/CONTRIBUTING.md new/yast2-update-3.1.28/CONTRIBUTING.md --- old/yast2-update-3.1.27/CONTRIBUTING.md 2015-02-09 17:32:10.000000000 +0100 +++ new/yast2-update-3.1.28/CONTRIBUTING.md 2015-05-18 17:27:09.000000000 +0200 @@ -12,13 +12,13 @@ ----------- If you find a problem, please report it either using -[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) +[Bugzilla](https://bugzilla.suse.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) or [GitHub issues](../../issues). (For Bugzilla, use the [simplified registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) if you don't have an account yet.) If you find a problem, please report it either using -[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee +[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee that every bug will be fixed, but we'll try. When creating a bug report, please follow our [bug reporting @@ -71,7 +71,7 @@ [widely used conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). -If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure +If your commit is related to a bug in Bugzilla or an issue on GitHub, make sure you mention it in the commit message for cross-reference. Use format like bnc#775814 or gh#yast/yast-foo#42. See also [GitHub autolinking](https://help.github.com/articles/github-flavored-markdown#references) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.27/package/yast2-update.changes new/yast2-update-3.1.28/package/yast2-update.changes --- old/yast2-update-3.1.27/package/yast2-update.changes 2015-02-09 17:32:10.000000000 +0100 +++ new/yast2-update-3.1.28/package/yast2-update.changes 2015-05-18 17:27:09.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 18 14:42:15 UTC 2015 - [email protected] + +- sort patterns in the upgrade summary to have stable output for + openQA tests (bsc#931295), escape the HTML tags +- 3.1.28 + +------------------------------------------------------------------- Mon Feb 9 16:18:41 UTC 2015 - [email protected] - install the packages needed for accesing the installation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.27/package/yast2-update.spec new/yast2-update-3.1.28/package/yast2-update.spec --- old/yast2-update-3.1.27/package/yast2-update.spec 2015-02-09 17:32:10.000000000 +0100 +++ new/yast2-update-3.1.28/package/yast2-update.spec 2015-05-18 17:27:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 3.1.27 +Version: 3.1.28 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.27/src/clients/update_proposal.rb new/yast2-update-3.1.28/src/clients/update_proposal.rb --- old/yast2-update-3.1.27/src/clients/update_proposal.rb 2015-02-09 17:32:10.000000000 +0100 +++ new/yast2-update-3.1.28/src/clients/update_proposal.rb 2015-05-18 17:27:09.000000000 +0200 @@ -25,7 +25,9 @@ # # Purpose: Let user choose update settings. # -# $Id$ + +require "cgi/util" + module Yast class UpdateProposalClient < Client include Yast::Logger @@ -209,14 +211,17 @@ "</li>\n" ) - if @patterns != nil && Ops.greater_than(Builtins.size(@patterns), 0) + if @patterns != nil && [email protected]? @summary_text = Ops.add(@summary_text, HTML.ListStart) + # sort the patterns + @patterns.sort! { |x, y| x["order"].to_i <=> y["order"].to_i } + Builtins.foreach(@patterns) do |p| @summary_text = Ops.add( Ops.add( Ops.add(@summary_text, "<li>"), - Ops.get_string(p, "summary", Ops.get_string(p, "name", "")) + CGI.escapeHTML(Ops.get_string(p, "summary", Ops.get_string(p, "name", ""))) ), "</li>\n" )
