Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2015-05-15 09:55: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 2015-05-07 09:21:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2015-05-15 09:55:22.000000000 +0200 @@ -1,0 +2,28 @@ +Tue May 12 11:28:00 CEST 2015 - [email protected] + +- Regarding some corner cases of bsc#925381. + -- Checking for availability of clients/<module>_auto module before + reporting an error. + -- Checking if a module supports more than one autoyast configuration + section. +- 3.1.81 + +------------------------------------------------------------------- +Fri May 11 14:39:27 CEST 2015 - [email protected] + +- Don't try to format PReP partitions (bsc#927748) + +------------------------------------------------------------------- +Mon May 11 14:20:03 CEST 2015 - [email protected] + +- fixed size parameter "auto" for PReP partitions (bsc#928768) +- 3.1.80 + +------------------------------------------------------------------- +Fri May 8 09:45:27 CEST 2015 - [email protected] + +- Added new section "restricts" for ntp configuration + (bnc#928987) +- 3.1.79 + +------------------------------------------------------------------- Old: ---- autoyast2-3.1.78.tar.bz2 New: ---- autoyast2-3.1.81.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.L3kzXD/_old 2015-05-15 09:55:23.000000000 +0200 +++ /var/tmp/diff_new_pack.L3kzXD/_new 2015-05-15 09:55:23.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package autoyast2 # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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: autoyast2 -Version: 3.1.78 +Version: 3.1.81 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,7 +38,7 @@ BuildRequires: yast2-storage BuildRequires: yast2-transfer BuildRequires: yast2-xml -BuildRequires: rubygem(rspec) +BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec) # %%{_unitdir} macro definition is in a separate package since 13.1 %if 0%{?suse_version} >= 1310 ++++++ autoyast2-3.1.78.tar.bz2 -> autoyast2-3.1.81.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.78/package/autoyast2.changes new/autoyast2-3.1.81/package/autoyast2.changes --- old/autoyast2-3.1.78/package/autoyast2.changes 2015-05-06 13:04:07.000000000 +0200 +++ new/autoyast2-3.1.81/package/autoyast2.changes 2015-05-13 15:04:07.000000000 +0200 @@ -1,4 +1,32 @@ ------------------------------------------------------------------- +Tue May 12 11:28:00 CEST 2015 - [email protected] + +- Regarding some corner cases of bsc#925381. + -- Checking for availability of clients/<module>_auto module before + reporting an error. + -- Checking if a module supports more than one autoyast configuration + section. +- 3.1.81 + +------------------------------------------------------------------- +Fri May 11 14:39:27 CEST 2015 - [email protected] + +- Don't try to format PReP partitions (bsc#927748) + +------------------------------------------------------------------- +Mon May 11 14:20:03 CEST 2015 - [email protected] + +- fixed size parameter "auto" for PReP partitions (bsc#928768) +- 3.1.80 + +------------------------------------------------------------------- +Fri May 8 09:45:27 CEST 2015 - [email protected] + +- Added new section "restricts" for ntp configuration + (bnc#928987) +- 3.1.79 + +------------------------------------------------------------------- Wed May 6 11:48:40 CEST 2015 - [email protected] - Added 'bootloader' and 'report' into list of supported profile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.78/package/autoyast2.spec new/autoyast2-3.1.81/package/autoyast2.spec --- old/autoyast2-3.1.78/package/autoyast2.spec 2015-05-06 13:04:07.000000000 +0200 +++ new/autoyast2-3.1.81/package/autoyast2.spec 2015-05-13 15:04:07.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.78 +Version: 3.1.81 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -32,7 +32,7 @@ BuildRequires: libxml2-tools # xsltproc for AutoinstClass BuildRequires: libxslt -BuildRequires: rubygem(rspec) +BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec) BuildRequires: yast2 BuildRequires: yast2-storage BuildRequires: yast2-xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.78/src/include/autoinstall/autopart.rb new/autoyast2-3.1.81/src/include/autoinstall/autopart.rb --- old/autoyast2-3.1.78/src/include/autoinstall/autopart.rb 2015-05-06 13:04:07.000000000 +0200 +++ new/autoyast2-3.1.81/src/include/autoinstall/autopart.rb 2015-05-13 15:04:07.000000000 +0200 @@ -130,6 +130,12 @@ valid_fsids.include?(partition["filesystem_id"]) end + def raw_partition?(partition) + valid_fsids = [Partitions.fsid_bios_grub, + Partitions.fsid_prep_chrp_boot, + Partitions.fsid_gpt_prep] + valid_fsids.include?(partition["filesystem_id"]) + end # Read partition data from XML control file # @return [Hash] flexible propsal map def preprocess_partition_config(xmlflex) @@ -228,8 +234,8 @@ end end - # Do not format BIOS Grup partitions - partition["format"] = false if partition["filesystem_id"] == Partitions.fsid_bios_grub + # Do not format raw partitions + partition["format"] = false if raw_partition?(partition) if Ops.get_integer(partition, "size", 0) == -1 Ops.set(partition, "size", 0) @@ -292,6 +298,7 @@ Ops.set(pb, "fsid", Partitions.FsidBoot(dlabel)) # FIXME: might be useless Ops.set(pb, "filesystem_id", Partitions.FsidBoot(dlabel)) Ops.set(pb, "id", Partitions.FsidBoot(dlabel)) # FIXME: might be useless + Ops.set(pb, "format", false) if raw_partition?(pb) Ops.set(pb, "auto_added", true) Ops.set(pb, "type", :primary) # FIXME: might be useless Ops.set(pb, "partition_type", "primary") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.78/src/include/autoinstall/xml.rb new/autoyast2-3.1.81/src/include/autoinstall/xml.rb --- old/autoyast2-3.1.78/src/include/autoinstall/xml.rb 2015-05-06 13:04:07.000000000 +0200 +++ new/autoyast2-3.1.81/src/include/autoinstall/xml.rb 2015-05-13 15:04:07.000000000 +0200 @@ -37,6 +37,7 @@ "initrd_modules" => "initrd_module", "nfs_entries" => "nfs_entry", "peers" => "peer", + "restricts" => "restrict", "netd_conf" => "conf", "raid" => "device", "hosts" => "hosts_entry", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.78/src/modules/AutoinstStorage.rb new/autoyast2-3.1.81/src/modules/AutoinstStorage.rb --- old/autoyast2-3.1.78/src/modules/AutoinstStorage.rb 2015-05-06 13:04:07.000000000 +0200 +++ new/autoyast2-3.1.81/src/modules/AutoinstStorage.rb 2015-05-13 15:04:07.000000000 +0200 @@ -851,7 +851,8 @@ ) ) elsif Ops.get_string(pe, "size", "") == "auto" && - Ops.get_string(pe, "mount", "") == "/boot" + ( Ops.get_string(pe, "mount", "") == "/boot" || + Partitions.IsPrepPartitionid(pe.fetch("partition_id", 0)) ) Ops.set( pe, "size", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.78/src/modules/Profile.rb new/autoyast2-3.1.81/src/modules/Profile.rb --- old/autoyast2-3.1.78/src/modules/Profile.rb 2015-05-06 13:04:07.000000000 +0200 +++ new/autoyast2-3.1.81/src/modules/Profile.rb 2015-05-13 15:04:07.000000000 +0200 @@ -13,26 +13,10 @@ # All these sections are handled by AutoYaST (or Installer) itself, # it doesn't use any external AutoYaST client for them GENERIC_PROFILE_SECTIONS = [ - # Booting is configured during the installation - "bootloader", - # Bug: this is already in every auto-generated profile - "deploy_image", - # AutoYaST configuration - complete configuration files - "files", - # AutoYaST configuration - default values - "general", # AutoYaST has its own partitioning "partitioning", # AutoYaST has its Preboot Execution Environment configuration - "pxe", - # Generic AutoYast settings - "report", - # AutoYaST configuration - pre and post-install scripts - "scripts", - # AutoYaST has also its own software selection - "software", - # Bug: This top-level entry belongs to users / groups - "user_defaults", + "pxe" ] # Dropped YaST modules that used to provide AutoYaST functionality diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.78/src/modules/Y2ModuleConfig.rb new/autoyast2-3.1.81/src/modules/Y2ModuleConfig.rb --- old/autoyast2-3.1.78/src/modules/Y2ModuleConfig.rb 2015-05-06 13:04:07.000000000 +0200 +++ new/autoyast2-3.1.81/src/modules/Y2ModuleConfig.rb 2015-05-13 15:04:07.000000000 +0200 @@ -12,6 +12,7 @@ class Y2ModuleConfigClass < Module # Key for AutoYaST client name in desktop file RESOURCE_NAME_KEY = "X-SuSE-YaST-AutoInstResource" + RESOURCE_NAME_MERGE_KEYS = "X-SuSE-YaST-AutoInstMerge" include Yast::Logger @@ -52,7 +53,7 @@ RESOURCE_NAME_KEY, "X-SuSE-YaST-AutoInstClient", "X-SuSE-YaST-Group", - "X-SuSE-YaST-AutoInstMerge", + RESOURCE_NAME_MERGE_KEYS, "X-SuSE-YaST-AutoInstMergeTypes", "X-SuSE-YaST-AutoInstDataType", "X-SuSE-YaST-AutoInstClonable", @@ -220,7 +221,7 @@ "X-SuSE-YaST-AutoInstDataType", "map" ) - tomerge = Ops.get_string(resourceMap, "X-SuSE-YaST-AutoInstMerge", "") + tomerge = Ops.get_string(resourceMap, RESOURCE_NAME_MERGE_KEYS, "") tomergetypes = Ops.get_string( resourceMap, "X-SuSE-YaST-AutoInstMergeTypes", @@ -349,15 +350,30 @@ profile_sections = Profile.current.keys profile_handlers = @ModuleMap.map do |name, desc| - desc[RESOURCE_NAME_KEY] || name + if desc[RESOURCE_NAME_MERGE_KEYS] + # The YAST module has diffent AutoYaST sections (resources). + # e.g. Users has: users,groups,user_defaults,login_settings + desc[RESOURCE_NAME_MERGE_KEYS].split(",") + else + # Taking the resource name or the plain module name. + desc[RESOURCE_NAME_KEY] || name + end end + profile_handlers.flatten! profile_sections.reject! do |section| profile_handlers.include?(section) end + # Sections which are not handled in any desktop file but the + # corresponding clients/*_auto.rb file is available. + # e.g. user_defaults, report, general, files, scripts + profile_sections.reject! do |section| + WFM.ClientExists("#{section}_auto") + end + # Generic sections are handled by AutoYast itself and not mentioned - # in any desktop file + # in any desktop or clients/*_auto.rb file. profile_sections - Yast::ProfileClass::GENERIC_PROFILE_SECTIONS end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.78/test/Makefile.am new/autoyast2-3.1.81/test/Makefile.am --- old/autoyast2-3.1.78/test/Makefile.am 2015-05-06 13:04:07.000000000 +0200 +++ new/autoyast2-3.1.81/test/Makefile.am 2015-05-13 15:04:07.000000000 +0200 @@ -5,7 +5,8 @@ TESTS = \ AutoInstallRules_test.rb \ AutoinstClass_test.rb \ - Y2ModuleConfig_test.rb + Y2ModuleConfig_test.rb \ + include/ask_test.rb TEST_EXTENSIONS = .rb RB_LOG_COMPILER = rspec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.78/test/Y2ModuleConfig_test.rb new/autoyast2-3.1.81/test/Y2ModuleConfig_test.rb --- old/autoyast2-3.1.78/test/Y2ModuleConfig_test.rb 2015-05-06 13:04:07.000000000 +0200 +++ new/autoyast2-3.1.81/test/Y2ModuleConfig_test.rb 2015-05-13 15:04:07.000000000 +0200 @@ -11,6 +11,27 @@ FIXTURES_PATH = File.join(File.dirname(__FILE__), 'fixtures') DESKTOP_DATA = YAML::load_file(File.join(FIXTURES_PATH, 'desktop_files', 'desktops.yml')) + before do + allow(Yast::WFM).to receive(:ClientExists).with("audit-laf_auto").and_return(false) + allow(Yast::WFM).to receive(:ClientExists).with("autofs_auto").and_return(false) + allow(Yast::WFM).to receive(:ClientExists).with("ca_mgm_auto").and_return(false) + allow(Yast::WFM).to receive(:ClientExists).with("deploy_image_auto").and_return(true) + allow(Yast::WFM).to receive(:ClientExists).with("files_auto").and_return(true) + allow(Yast::WFM).to receive(:ClientExists).with("firstboot_auto").and_return(false) + allow(Yast::WFM).to receive(:ClientExists).with("general_auto").and_return(true) + allow(Yast::WFM).to receive(:ClientExists).with("language_auto").and_return(false) + allow(Yast::WFM).to receive(:ClientExists).with("pxe_auto").and_return(false) + allow(Yast::WFM).to receive(:ClientExists).with("restore_auto").and_return(false) + allow(Yast::WFM).to receive(:ClientExists).with("runlevel_auto").and_return(false) + allow(Yast::WFM).to receive(:ClientExists).with("scripts_auto").and_return(true) + allow(Yast::WFM).to receive(:ClientExists).with("software_auto").and_return(true) + allow(Yast::WFM).to receive(:ClientExists).with("sshd_auto").and_return(false) + allow(Yast::WFM).to receive(:ClientExists).with("sysconfig_auto").and_return(false) + allow(Yast::WFM).to receive(:ClientExists).with("unknown_profile_item_1_auto").and_return(false) + allow(Yast::WFM).to receive(:ClientExists).with("unknown_profile_item_2_auto").and_return(false) + allow(Yast::WFM).to receive(:ClientExists).with("partitioning_auto").and_return(false) + end + describe "#unhandled_profile_sections" do let(:profile_unhandled) { File.join(FIXTURES_PATH, 'profiles', 'unhandled_and_obsolete.xml') } @@ -22,7 +43,7 @@ [ "audit-laf", "autofs", "ca_mgm", "firstboot", "language", "restore", "runlevel", "sshd", "sysconfig", "unknown_profile_item_1", - "unknown_profile_item_2", "users" + "unknown_profile_item_2" ].sort ) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.78/test/fixtures/desktop_files/desktops.yml new/autoyast2-3.1.81/test/fixtures/desktop_files/desktops.yml --- old/autoyast2-3.1.78/test/fixtures/desktop_files/desktops.yml 2015-05-06 13:04:07.000000000 +0200 +++ new/autoyast2-3.1.81/test/fixtures/desktop_files/desktops.yml 2015-05-13 15:04:07.000000000 +0200 @@ -1,4 +1,13 @@ --- +users: + Name: User and Group Management + GenericName: Add, Edit, Delete Users or User Groups + Icon: yast-users + X-SuSE-YaST-Group: Security + X-SuSE-YaST-AutoInst: all + X-SuSE-YaST-AutoInstClonable: true + X-SuSE-YaST-AutoInstMerge: users,groups,user_defaults,login_settings + X-SuSE-YaST-AutoInstMergeTypes: list,list,map,map firewall: Name: Firewall GenericName: Configure a firewall
