Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2014-01-29 07:12:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-01-10 21:14:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2014-01-29 07:12:23.000000000 +0100 @@ -1,0 +2,20 @@ +Tue Jan 28 17:37:57 UTC 2014 - [email protected] + +- In first stage export only proposed values without reading from + system (FATE#308539) +- 3.1.10 + +------------------------------------------------------------------- +Tue Jan 28 15:36:12 UTC 2014 - [email protected] + +- Fix export in first stage (FATE#308539) +- 3.1.9 + +------------------------------------------------------------------- +Fri Jan 24 15:38:20 UTC 2014 - [email protected] + +- add support for semi-automatic installation for partitioning + (FATE#314695) +- 3.1.8 + +------------------------------------------------------------------- Old: ---- autoyast2-3.1.7.tar.bz2 New: ---- autoyast2-3.1.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.DcIhbm/_old 2014-01-29 07:12:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DcIhbm/_new 2014-01-29 07:12:23.000000000 +0100 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.7 +Version: 3.1.10 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-3.1.7.tar.bz2 -> autoyast2-3.1.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.7/package/autoyast2.changes new/autoyast2-3.1.10/package/autoyast2.changes --- old/autoyast2-3.1.7/package/autoyast2.changes 2014-01-09 19:44:56.000000000 +0100 +++ new/autoyast2-3.1.10/package/autoyast2.changes 2014-01-28 19:20:22.000000000 +0100 @@ -1,4 +1,24 @@ ------------------------------------------------------------------- +Tue Jan 28 17:37:57 UTC 2014 - [email protected] + +- In first stage export only proposed values without reading from + system (FATE#308539) +- 3.1.10 + +------------------------------------------------------------------- +Tue Jan 28 15:36:12 UTC 2014 - [email protected] + +- Fix export in first stage (FATE#308539) +- 3.1.9 + +------------------------------------------------------------------- +Fri Jan 24 15:38:20 UTC 2014 - [email protected] + +- add support for semi-automatic installation for partitioning + (FATE#314695) +- 3.1.8 + +------------------------------------------------------------------- Thu Jan 9 19:38:09 CET 2014 - [email protected] - remove dependency on yast2-slp (bnc#858102) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.7/package/autoyast2.spec new/autoyast2-3.1.10/package/autoyast2.spec --- old/autoyast2-3.1.7/package/autoyast2.spec 2014-01-09 19:44:56.000000000 +0100 +++ new/autoyast2-3.1.10/package/autoyast2.spec 2014-01-28 19:20:22.000000000 +0100 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.7 +Version: 3.1.10 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.7/src/autoyast-rnc/general.rnc new/autoyast2-3.1.10/src/autoyast-rnc/general.rnc --- old/autoyast2-3.1.7/src/autoyast-rnc/general.rnc 2014-01-09 19:44:56.000000000 +0100 +++ new/autoyast2-3.1.10/src/autoyast-rnc/general.rnc 2014-01-28 19:20:22.000000000 +0100 @@ -80,7 +80,7 @@ } semi-automatic = element semi-automatic { LIST, semi-automatic-modules* } -semi-automatic-modules = element module { "networking" } +semi-automatic-modules = element module { "networking" | "partitioning" } signature-handling = element signature-handling { accept_unsigned_file? & accept_file_without_checksum? & accept_verification_failed? & accept_unknown_gpg_key? & import_gpg_key? & accept_non_trusted_gpg_key? } accept_unsigned_file = element accept_unsigned_file { BOOLEAN } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.7/src/clients/inst_autosetup.rb new/autoyast2-3.1.10/src/clients/inst_autosetup.rb --- old/autoyast2-3.1.7/src/clients/inst_autosetup.rb 2014-01-09 19:44:56.000000000 +0100 +++ new/autoyast2-3.1.10/src/clients/inst_autosetup.rb 2014-01-28 19:20:22.000000000 +0100 @@ -239,39 +239,31 @@ # recognize this now Storage.ReReadTargetMap + if Profile.current["partitioning"] && !Profile.current["partitioning"].empty? + AutoinstStorage.Import(Profile.current["partitioning"]) + write_storage = true + elsif Profile.current["partitioning_advanced"] && !Profile.current["partitioning_advanced"].empty? + AutoinstStorage.ImportAdvanced(Profile.current["partitioning_advanced"]) + write_storage = true # No partitioning in the profile means yast2-storage proposal (hmmmm.....) - if Ops.greater_than( - Builtins.size(Ops.get_list(Profile.current, "partitioning", [])), - 0 - ) - AutoinstStorage.Import( - Ops.get_list(Profile.current, "partitioning", []) - ) - elsif Ops.greater_than( - Builtins.size( - Ops.get_map(Profile.current, "partitioning_advanced", {}) - ), - 0 - ) - AutoinstStorage.ImportAdvanced( - Ops.get_map(Profile.current, "partitioning_advanced", {}) - ) else Storage.SetTestsuite(true) # FIXME: *urgs* WFM.CallFunction("inst_disk_proposal", [true, true]) # FIXME: fragile? Storage.SetTestsuite(false) # *urgs* again end - if (Ops.greater_than( - Builtins.size(Ops.get_list(Profile.current, "partitioning", [])), - 0 - ) || - Ops.greater_than( - Builtins.size( - Ops.get_map(Profile.current, "partitioning_advanced", {}) - ), - 0 - )) && + semiauto_partitions = Profile.current["general"]["semi-automatic"] && + Profile.current["general"]["semi-automatic"].include?("partitioning") + + if semiauto_partitions + Builtins.y2milestone("Partitioning manual setup") + # Yes, do not set Storage testsuite here as we want really GUI with proposal + Call.Function("inst_disk_proposal", ["enable_next" => true]) + write_storage = true + end + + + if write_storage && !AutoinstStorage.Write Report.Error(_("Error while configuring partitions.\nTry again.\n")) Builtins.y2error("Aborting...") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.7/src/modules/AutoinstClone.rb new/autoyast2-3.1.10/src/modules/AutoinstClone.rb --- old/autoyast2-3.1.7/src/modules/AutoinstClone.rb 2014-01-09 19:44:56.000000000 +0100 +++ new/autoyast2-3.1.10/src/modules/AutoinstClone.rb 2014-01-28 19:20:22.000000000 +0100 @@ -172,21 +172,25 @@ Profile.Reset Profile.prepare = true Mode.SetMode("autoinst_config") - Builtins.foreach(Y2ModuleConfig.ModuleMap) do |def_resource, resourceMap| - # Set resource name, if not using default value - resource = Ops.get_string( - resourceMap, - "X-SuSE-YaST-AutoInstResource", - "" - ) - resource = def_resource if resource == "" - Builtins.y2debug("current resource: %1", resource) - if Builtins.contains(@additional, resource) - ret = CommonClone(def_resource, resourceMap) + + # do not read settings from system in first stage, autoyast profile + # should contain only proposed and user modified values + if !Stage.initial + Builtins.foreach(Y2ModuleConfig.ModuleMap) do |def_resource, resourceMap| + # Set resource name, if not using default value + resource = Ops.get_string( + resourceMap, + "X-SuSE-YaST-AutoInstResource", + "" + ) + resource = def_resource if resource == "" + Builtins.y2debug("current resource: %1", resource) + if Builtins.contains(@additional, resource) + ret = CommonClone(def_resource, resourceMap) + end end end - Call.Function("general_auto", ["Import", General()]) Call.Function("general_auto", ["SetModified"]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.7/src/modules/Y2ModuleConfig.rb new/autoyast2-3.1.10/src/modules/Y2ModuleConfig.rb --- old/autoyast2-3.1.7/src/modules/Y2ModuleConfig.rb 2014-01-09 19:44:56.000000000 +0100 +++ new/autoyast2-3.1.10/src/modules/Y2ModuleConfig.rb 2014-01-28 19:20:22.000000000 +0100 @@ -158,20 +158,18 @@ # Constructor def Y2ModuleConfig # Read module configuration data (desktop files) - if !Stage.initial - _MenuEntries = [] - if Mode.autoinst - _MenuEntries = ReadMenuEntries(["all", "write"]) - else - _MenuEntries = ReadMenuEntries(["all", "configure"]) - end + _MenuEntries = [] + if Mode.autoinst + _MenuEntries = ReadMenuEntries(["all", "write"]) + else + _MenuEntries = ReadMenuEntries(["all", "configure"]) + end - @ModuleMap = Ops.get_map(_MenuEntries, 0, {}) + @ModuleMap = Ops.get_map(_MenuEntries, 0, {}) - Profile.ModuleMap = deep_copy(@ModuleMap) + Profile.ModuleMap = deep_copy(@ModuleMap) - @GroupMap = Ops.get_map(_MenuEntries, 1, {}) - end + @GroupMap = Ops.get_map(_MenuEntries, 1, {}) if Mode.config # construct the tree menu -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
