Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2016-02-17 10:33:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2" Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2016-01-23 01:15:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2016-02-17 12:09:42.000000000 +0100 @@ -1,0 +2,17 @@ +Thu Feb 11 15:30:55 CET 2016 - [email protected] + +- Confirming base product license. This can be defined by the flag + <confirm_base_product_license> in the general/mode section. + Confirming licenses of add-on products can be defined for each + product by the flag <confirm_license> in the add-on product + description. + (Fate#318945) +- 3.1.114 + +------------------------------------------------------------------- +Fri Jan 29 09:04:47 UTC 2016 - [email protected] + +- "haspcmcia" method is removed from the AutoInstallRules API + (bnc#964151) + +------------------------------------------------------------------- Old: ---- autoyast2-3.1.113.tar.bz2 New: ---- autoyast2-3.1.114.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.z39SjJ/_old 2016-02-17 12:09:43.000000000 +0100 +++ /var/tmp/diff_new_pack.z39SjJ/_new 2016-02-17 12:09:43.000000000 +0100 @@ -18,7 +18,7 @@ Name: autoyast2 -Version: 3.1.113 +Version: 3.1.114 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-3.1.113.tar.bz2 -> autoyast2-3.1.114.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.113/package/autoyast2.changes new/autoyast2-3.1.114/package/autoyast2.changes --- old/autoyast2-3.1.113/package/autoyast2.changes 2016-01-21 10:44:11.000000000 +0100 +++ new/autoyast2-3.1.114/package/autoyast2.changes 2016-02-12 10:49:13.000000000 +0100 @@ -1,4 +1,21 @@ ------------------------------------------------------------------- +Thu Feb 11 15:30:55 CET 2016 - [email protected] + +- Confirming base product license. This can be defined by the flag + <confirm_base_product_license> in the general/mode section. + Confirming licenses of add-on products can be defined for each + product by the flag <confirm_license> in the add-on product + description. + (Fate#318945) +- 3.1.114 + +------------------------------------------------------------------- +Fri Jan 29 09:04:47 UTC 2016 - [email protected] + +- "haspcmcia" method is removed from the AutoInstallRules API + (bnc#964151) + +------------------------------------------------------------------- Wed Jan 20 16:31:03 CET 2016 - [email protected] - LVM: taking care about "auto" option --> switching to "max". diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.113/package/autoyast2.spec new/autoyast2-3.1.114/package/autoyast2.spec --- old/autoyast2-3.1.113/package/autoyast2.spec 2016-01-21 10:44:11.000000000 +0100 +++ new/autoyast2-3.1.114/package/autoyast2.spec 2016-02-12 10:49:13.000000000 +0100 @@ -18,7 +18,7 @@ Name: autoyast2 -Version: 3.1.113 +Version: 3.1.114 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.113/src/clients/ayast_probe.rb new/autoyast2-3.1.114/src/clients/ayast_probe.rb --- old/autoyast2-3.1.113/src/clients/ayast_probe.rb 2016-01-21 10:44:11.000000000 +0100 +++ new/autoyast2-3.1.114/src/clients/ayast_probe.rb 2016-02-12 10:49:13.000000000 +0100 @@ -44,8 +44,7 @@ "mac" => AutoInstallRules.mac, "linux" => AutoInstallRules.linux, "others" => AutoInstallRules.others, - "xserver" => AutoInstallRules.xserver, - "haspcmcia" => AutoInstallRules.haspcmcia + "xserver" => AutoInstallRules.xserver } @text = "<h3>Keys for rules</h3><table>" Builtins.foreach(@attrs) do |k, v| diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.113/src/clients/inst_autosetup.rb new/autoyast2-3.1.114/src/clients/inst_autosetup.rb --- old/autoyast2-3.1.113/src/clients/inst_autosetup.rb 2016-01-21 10:44:11.000000000 +0100 +++ new/autoyast2-3.1.114/src/clients/inst_autosetup.rb 2016-02-12 10:49:13.000000000 +0100 @@ -40,12 +40,14 @@ Yast.import "Keyboard" Yast.import "Call" Yast.import "ProductControl" + Yast.import "ProductLicense" Yast.import "LanUdevAuto" Yast.import "Language" Yast.import "Console" Yast.import "ServicesManager" Yast.import "Y2ModuleConfig" Yast.import "AutoinstFunctions" + Yast.import "Wizard" Yast.include self, "bootloader/routines/autoinstall.rb" Yast.include self, "autoinstall/ask.rb" @@ -62,7 +64,8 @@ _("Registration"), _("Configure Software selections"), _("Configure Systemd Default Target"), - _("Configure users and groups") + _("Configure users and groups"), + _("Confirm License") ] @progress_descriptions = [ @@ -74,7 +77,8 @@ _("Registering the system..."), _("Configuring Software selections..."), _("Configuring Systemd Default Target..."), - _("Importing users and groups configuration...") + _("Importing users and groups configuration..."), + _("Confirming License...") ] Progress.New( @@ -397,6 +401,26 @@ Progress.NextStage autosetup_users + # + # Checking Base Product licenses + # + Progress.NextStage + if general_section["mode"].fetch( "confirm_base_product_license", false ) + Wizard.EnableAbortButton + result = ProductLicense.AskLicenseAgreement(nil, + "", + ProductLicense.license_patterns, + "abort", + # back button is disabled + false, + true, + true, + # unique id + "0" + ) + return :abort if result == :abort + end + Progress.Finish @ret = ProductControl.RunFrom( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.113/src/modules/AutoInstallRules.rb new/autoyast2-3.1.114/src/modules/AutoInstallRules.rb --- old/autoyast2-3.1.113/src/modules/AutoInstallRules.rb 2016-01-21 10:44:11.000000000 +0100 +++ new/autoyast2-3.1.114/src/modules/AutoInstallRules.rb 2016-02-12 10:49:14.000000000 +0100 @@ -87,7 +87,6 @@ @linux = 0 @others = 0 @xserver = "" - @haspcmcia = "0" #/////////////////////////////////////////// #/////////////////////////////////////////// @@ -297,10 +296,6 @@ Ops.set(@ATTR, "domain", @domain) @network = Convert.to_string(SCR.Read(path(".etc.install_inf.Network"))) Ops.set(@ATTR, "network", @network) - @haspcmcia = Convert.to_string( - SCR.Read(path(".etc.install_inf.HasPCMCIA")) - ) - Ops.set(@ATTR, "haspcmcia", @haspcmcia) @xserver = Convert.to_string(SCR.Read(path(".etc.install_inf.XServer"))) Ops.set(@ATTR, "xserver", @xserver) @@ -542,10 +537,6 @@ shellseg(ismatch, rule, match, op, matchtype) ismatch = true Ops.set(@env, rule, @totaldisk) - elsif rule == "haspcmcia" - shellseg(ismatch, rule, match, op, matchtype) - ismatch = true - Ops.set(@env, rule, @haspcmcia) elsif rule == "disksize" Builtins.y2debug("creating rule check for disksize") disk = Builtins.splitstring(match, " ") @@ -1140,7 +1131,6 @@ publish :variable => :linux, :type => "integer" publish :variable => :others, :type => "integer" publish :variable => :xserver, :type => "string" - publish :variable => :haspcmcia, :type => "string" publish :variable => :NonLinuxPartitions, :type => "list" publish :variable => :LinuxPartitions, :type => "list" publish :variable => :UserRules, :type => "map <string, any>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.113/test/AutoInstallRules_test.rb new/autoyast2-3.1.114/test/AutoInstallRules_test.rb --- old/autoyast2-3.1.113/test/AutoInstallRules_test.rb 2016-01-21 10:44:11.000000000 +0100 +++ new/autoyast2-3.1.114/test/AutoInstallRules_test.rb 2016-02-12 10:49:14.000000000 +0100 @@ -80,7 +80,6 @@ expect(Yast::SCR).to receive(:Read).with(Yast::Path.new(".etc.install_inf.Domain")) expect(Yast::SCR).to receive(:Read).with(Yast::Path.new(".etc.install_inf.Hostname")) expect(Yast::SCR).to receive(:Read).with(Yast::Path.new(".etc.install_inf.Network")) - expect(Yast::SCR).to receive(:Read).with(Yast::Path.new(".etc.install_inf.HasPCMCIA")) expect(Yast::SCR).to receive(:Read).with(Yast::Path.new(".etc.install_inf.XServer")) expect(Yast::StorageControllers).to receive(:Initialize)
