Hello community, here is the log from the commit of package yast2-add-on for openSUSE:Factory checked in at 2016-02-17 10:33:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-add-on (Old) and /work/SRC/openSUSE:Factory/.yast2-add-on.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-add-on" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-add-on/yast2-add-on.changes 2015-10-20 16:20:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-add-on.new/yast2-add-on.changes 2016-02-17 12:26:50.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 11 15:15:24 CET 2016 - sch...@suse.de + +- Confirming add-on product licenses while AutoYaST installation. + (Fate#318945) +- 3.1.12 + +------------------------------------------------------------------- Old: ---- yast2-add-on-3.1.11.tar.bz2 New: ---- yast2-add-on-3.1.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.AvgRRH/_old 2016-02-17 12:26:50.000000000 +0100 +++ /var/tmp/diff_new_pack.AvgRRH/_new 2016-02-17 12:26:50.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-add-on # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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-add-on -Version: 3.1.11 +Version: 3.1.12 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-add-on-3.1.11.tar.bz2 -> yast2-add-on-3.1.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.11/package/yast2-add-on.changes new/yast2-add-on-3.1.12/package/yast2-add-on.changes --- old/yast2-add-on-3.1.11/package/yast2-add-on.changes 2015-10-08 15:00:10.000000000 +0200 +++ new/yast2-add-on-3.1.12/package/yast2-add-on.changes 2016-02-12 10:51:38.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 11 15:15:24 CET 2016 - sch...@suse.de + +- Confirming add-on product licenses while AutoYaST installation. + (Fate#318945) +- 3.1.12 + +------------------------------------------------------------------- Wed Oct 7 19:22:13 UTC 2015 - lsle...@suse.cz - restart the installation workflow to activate the new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.11/package/yast2-add-on.spec new/yast2-add-on-3.1.12/package/yast2-add-on.spec --- old/yast2-add-on-3.1.11/package/yast2-add-on.spec 2015-10-08 15:00:10.000000000 +0200 +++ new/yast2-add-on-3.1.12/package/yast2-add-on.spec 2016-02-12 10:51:38.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 3.1.11 +Version: 3.1.12 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.11/src/clients/add-on_auto.rb new/yast2-add-on-3.1.12/src/clients/add-on_auto.rb --- old/yast2-add-on-3.1.11/src/clients/add-on_auto.rb 2015-10-08 15:00:10.000000000 +0200 +++ new/yast2-add-on-3.1.12/src/clients/add-on_auto.rb 2016-02-12 10:51:38.000000000 +0100 @@ -179,23 +179,26 @@ srcid = Pkg.SourceCreate(url, pth) - if (srcid == -1 || srcid == nil) && - !Ops.get_boolean(prod, "ask_on_error", false) - # error report - Report.Error(_("Failed to add add-on product.")) - elsif (srcid == -1 || srcid == nil) && - Ops.get_boolean(prod, "ask_on_error", false) - Ops.set( - prod, - "ask_on_error", - Popup.ContinueCancel( + if (srcid == -1 || srcid == nil) + if Ops.get_boolean(prod, "ask_on_error", false) + prod["ask_on_error"] = Popup.ContinueCancel( Builtins.sformat( _("Make the add-on \"%1\" available via \"%2\"."), Ops.get_string(prod, "product", ""), media ) ) - ) + else + # just report error + Report.Error(_("Failed to add add-on product.")) + end + elsif Ops.get_boolean(prod, "confirm_license", false) + accepted = AddOnProduct.AcceptedLicenseAndInfoFile( srcid ) + if accepted == false + Builtins.y2warning("License not accepted, delete the repository and halt the system") + Pkg.SourceDelete(srcid) + SCR.Execute(path(".target.bash"), "/sbin/halt -f -n -p") + end end Ops.set(@sources, [media, pth], srcid)