Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2018-02-07 18:18:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2" Wed Feb 7 18:18:12 2018 rev:232 rq:573246 version:4.0.29 Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2018-02-02 22:18:46.783686363 +0100 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2018-02-07 18:18:23.100920089 +0100 @@ -1,0 +2,8 @@ +Mon Feb 5 09:22:20 UTC 2018 - [email protected] + +- fate#323460 + - support for disabling edit action per module. Currently used + mainly by the new firewall module +- 4.0.29 + +------------------------------------------------------------------- Old: ---- autoyast2-4.0.28.tar.bz2 New: ---- autoyast2-4.0.29.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.0tgKrw/_old 2018-02-07 18:18:23.692892353 +0100 +++ /var/tmp/diff_new_pack.0tgKrw/_new 2018-02-07 18:18:23.696892165 +0100 @@ -22,7 +22,7 @@ %endif Name: autoyast2 -Version: 4.0.28 +Version: 4.0.29 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-4.0.28.tar.bz2 -> autoyast2-4.0.29.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.28/package/autoyast2.changes new/autoyast2-4.0.29/package/autoyast2.changes --- old/autoyast2-4.0.28/package/autoyast2.changes 2018-02-01 15:05:23.000000000 +0100 +++ new/autoyast2-4.0.29/package/autoyast2.changes 2018-02-06 10:32:31.000000000 +0100 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Feb 5 09:22:20 UTC 2018 - [email protected] + +- fate#323460 + - support for disabling edit action per module. Currently used + mainly by the new firewall module +- 4.0.29 + +------------------------------------------------------------------- Thu Feb 1 12:59:08 CET 2018 - [email protected] - Report packages which cannot be select for installation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.28/package/autoyast2.spec new/autoyast2-4.0.29/package/autoyast2.spec --- old/autoyast2-4.0.28/package/autoyast2.spec 2018-02-01 15:05:23.000000000 +0100 +++ new/autoyast2-4.0.29/package/autoyast2.spec 2018-02-06 10:32:31.000000000 +0100 @@ -22,7 +22,7 @@ %endif Name: autoyast2 -Version: 4.0.28 +Version: 4.0.29 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.28/src/fillup/sysconfig.autoinstall new/autoyast2-4.0.29/src/fillup/sysconfig.autoinstall --- old/autoyast2-4.0.28/src/fillup/sysconfig.autoinstall 2018-02-01 15:05:23.000000000 +0100 +++ new/autoyast2-4.0.29/src/fillup/sysconfig.autoinstall 2018-02-06 10:32:31.000000000 +0100 @@ -28,3 +28,9 @@ # FORBID_WRITENOW="add-on,suse_register,partitioning,bootloader,general,report,software" +## Type: string +## Default: "firewall" +# +# Listed modules have Edit button / action disabled at AutoYaST UI +# +FORBID_EDIT="firewall" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.28/src/include/autoinstall/conftree.rb new/autoyast2-4.0.29/src/include/autoinstall/conftree.rb --- old/autoyast2-4.0.28/src/include/autoinstall/conftree.rb 2018-02-01 15:05:23.000000000 +0100 +++ new/autoyast2-4.0.29/src/include/autoinstall/conftree.rb 2018-02-06 10:32:31.000000000 +0100 @@ -253,6 +253,8 @@ UI.ChangeWidget(Id(:writeNow), :Enabled, false) end + UI.ChangeWidget(Id(:configure), :Enabled, false) if AutoinstConfig.dont_edit.include?(selectedModule) + # set read button status resourceMap = Y2ModuleConfig.ModuleMap.fetch(selectedModule, {}) clonable = resourceMap["X-SuSE-YaST-AutoInstClonable"] == "true" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.28/src/modules/AutoinstConfig.rb new/autoyast2-4.0.29/src/modules/AutoinstConfig.rb --- old/autoyast2-4.0.28/src/modules/AutoinstConfig.rb 2018-02-01 15:05:23.000000000 +0100 +++ new/autoyast2-4.0.29/src/modules/AutoinstConfig.rb 2018-02-06 10:32:31.000000000 +0100 @@ -13,6 +13,7 @@ import "ServicesManagerTarget" class AutoinstConfigClass < Module + attr_reader(:dont_edit) module Target include ServicesManagerTargetClass::BaseTargets @@ -180,6 +181,9 @@ # @noWriteNow = [] + # Edit button is disabled for these modules + @dont_edit = [] + # # Halt after initial phase # @@ -468,25 +472,14 @@ end elsif Mode.config # Load configuration data from /etc/sysconfig/autoinstall - @Repository = Misc.SysconfigRead( - path(".sysconfig.autoinstall.REPOSITORY"), - "/var/lib/autoinstall/repository/" - ) - @classDir = Misc.SysconfigRead( - path(".sysconfig.autoinstall.CLASS_DIR"), - Ops.add(@Repository, "/classes") - ) - tmp_dontmerge = Misc.SysconfigRead( - path(".sysconfig.autoinstall.XSLT_DONTMERGE"), - "addon,conf" - ) - tmp_no_writenow = Misc.SysconfigRead( - path(".sysconfig.autoinstall.FORBID_WRITENOW"), - "add-on,suse_register,partitioning,bootloader,general,report" - ) + @Repository = sysconfig_autoinstall("REPOSITORY", "/var/lib/autoinstall/repository/") + @classDir = sysconfig_autoinstall("CLASS_DIR", @Repository + "/classes") + tmp_dontmerge = sysconfig_autoinstall("XSLT_DONTMERGE", "addon,conf") + tmp_no_writenow = sysconfig_autoinstall("FORBID_WRITENOW", "add-on,suse_register,partitioning,bootloader,general,report") @dontmerge = Builtins.splitstring(tmp_dontmerge, ",") @noWriteNow = Builtins.splitstring(tmp_no_writenow, ",") + @dont_edit = sysconfig_autoinstall("FORBID_EDIT").split(",") # Set the defaults, just in case. if @Repository == "" || @Repository == nil @@ -594,6 +587,20 @@ publish :function => :AutoinstConfig, :type => "void ()" publish :function => :MainHelp, :type => "string ()" publish :function => :check_second_stage_environment, :type => "string ()" + + private + + # Reads configuration from /etc/sysconfig/autoinstall + # + # @param [String] option an option name string as can be found in /etc/sysconfig/autoinstall + # @param [String] default a default value for the option + # @return [String] option value or default + def sysconfig_autoinstall(option, default = "") + Misc.SysconfigRead( + path(".sysconfig.autoinstall.#{option}"), + default + ) + end end AutoinstConfig = AutoinstConfigClass.new
