Hello community, here is the log from the commit of package yast2-update for openSUSE:Factory checked in at 2014-11-24 11:13:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-09-07 11:09:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-update.new/yast2-update.changes 2014-11-24 11:13:11.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Nov 12 15:59:22 UTC 2014 - [email protected] + +- display product names in the incompatible products error + message (bnc#904192) +- 3.1.24 + +------------------------------------------------------------------- Old: ---- yast2-update-3.1.23.tar.bz2 New: ---- yast2-update-3.1.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.dUW78A/_old 2014-11-24 11:13:13.000000000 +0100 +++ /var/tmp/diff_new_pack.dUW78A/_new 2014-11-24 11:13:13.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 3.1.23 +Version: 3.1.24 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-update-3.1.23.tar.bz2 -> yast2-update-3.1.24.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.23/.travis.yml new/yast2-update-3.1.24/.travis.yml --- old/yast2-update-3.1.23/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-update-3.1.24/.travis.yml 2014-11-14 20:22:35.000000000 +0100 @@ -0,0 +1,16 @@ +language: cpp +compiler: + - gcc +before_install: + # disable rvm, use system Ruby + - rvm reset + - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh + - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-packager yast2-installation-control" -g "rspec:2.14.1 yast-rake gettext" +script: + - rake check:syntax + - rake check:pot + - make -f Makefile.cvs + - make + - sudo make install + - make check + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.23/MAINTAINER new/yast2-update-3.1.24/MAINTAINER --- old/yast2-update-3.1.23/MAINTAINER 2014-09-04 16:29:05.000000000 +0200 +++ new/yast2-update-3.1.24/MAINTAINER 2014-11-14 20:22:35.000000000 +0100 @@ -1 +1 @@ -Jiří Suchomel <[email protected]> +Deprecated file. Use `osc maintainer yast2-update` instead. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.23/README.md new/yast2-update-3.1.24/README.md --- old/yast2-update-3.1.23/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-update-3.1.24/README.md 2014-11-14 20:22:35.000000000 +0100 @@ -0,0 +1,5 @@ +# YaST - The Update Module # + +[](https://travis-ci.org/yast/yast-update) +[](https://ci.opensuse.org/view/Yast/job/yast-update-master/) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.23/package/yast2-update.changes new/yast2-update-3.1.24/package/yast2-update.changes --- old/yast2-update-3.1.23/package/yast2-update.changes 2014-09-04 16:29:05.000000000 +0200 +++ new/yast2-update-3.1.24/package/yast2-update.changes 2014-11-14 20:22:35.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Nov 12 15:59:22 UTC 2014 - [email protected] + +- display product names in the incompatible products error + message (bnc#904192) +- 3.1.24 + +------------------------------------------------------------------- Thu Sep 4 12:31:48 UTC 2014 - [email protected] - Use a more flexible rubygem requirement syntax (bnc#895069) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.23/package/yast2-update.spec new/yast2-update-3.1.24/package/yast2-update.spec --- old/yast2-update-3.1.23/package/yast2-update.spec 2014-09-04 16:29:05.000000000 +0200 +++ new/yast2-update-3.1.24/package/yast2-update.spec 2014-11-14 20:22:35.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 3.1.23 +Version: 3.1.24 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.23/src/clients/update_proposal.rb new/yast2-update-3.1.24/src/clients/update_proposal.rb --- old/yast2-update-3.1.23/src/clients/update_proposal.rb 2014-09-04 16:29:05.000000000 +0200 +++ new/yast2-update-3.1.24/src/clients/update_proposal.rb 2014-11-14 20:22:35.000000000 +0100 @@ -95,17 +95,6 @@ init_stuff - if Update.products_incompatible - return { - # error message in proposal - "warning" => _( - "The installed product is not compatible with the product on the installation media." - ), - "warning_level" => :fatal, - "raw_proposal" => [] - } - end - # TRANSLATORS: unknown product (label) @update_from = _("Unknown product") if Ops.get_string(Installation.installedVersion, "show", "") != "" && @@ -132,6 +121,18 @@ @update_to = Ops.get_string(Installation.updateVersion, "name", "") end + if Update.products_incompatible + return { + # error message in proposal + "warning" => _( + "The installed product (%{update_from}) is not compatible with " \ + "the product on the installation media (%{update_to})." + ) % { :update_from => @update_from, :update_to => @update_to }, + "warning_level" => :fatal, + "raw_proposal" => [] + } + end + # when versions don't match and upgrade is not allowed (running system) if Ops.get_string(Installation.installedVersion, "version", "A") != Ops.get_string(Installation.updateVersion, "version", "B") && diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.23/test/suse_release_test.rb new/yast2-update-3.1.24/test/suse_release_test.rb --- old/yast2-update-3.1.23/test/suse_release_test.rb 2014-09-04 16:29:05.000000000 +0200 +++ new/yast2-update-3.1.24/test/suse_release_test.rb 2014-11-14 20:22:35.000000000 +0100 @@ -1,4 +1,4 @@ -#! /usr/bin/rspec +#!/usr/bin/env rspec ENV["Y2DIR"] = File.join(File.expand_path(File.dirname(__FILE__)), "../src/") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.23/test/update_test.rb new/yast2-update-3.1.24/test/update_test.rb --- old/yast2-update-3.1.23/test/update_test.rb 2014-09-04 16:29:05.000000000 +0200 +++ new/yast2-update-3.1.24/test/update_test.rb 2014-11-14 20:22:35.000000000 +0100 @@ -1,4 +1,4 @@ -#! /usr/bin/rspec +#!/usr/bin/env rspec ENV["Y2DIR"] = File.join(File.expand_path(File.dirname(__FILE__)), "../src/") -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
