Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2019-10-21 12:26:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2" Mon Oct 21 12:26:30 2019 rev:264 rq:741105 version:4.2.12 Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2019-10-16 09:11:42.788019956 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new.2352/autoyast2.changes 2019-10-21 12:26:37.895840369 +0200 @@ -1,0 +2,14 @@ +Fri Oct 18 14:03:27 UTC 2019 - Ladislav Slezák <[email protected]> + +- AutoYaST support for the OnlineOnly installation medium + (jsc#SLE-7214) +- 4.2.12 + +------------------------------------------------------------------- +Wed Oct 16 11:36:17 UTC 2019 - Ladislav Slezák <[email protected]> + +- Do not run the registration step again in the installed system + (in the 2nd stage after reboot) (bsc#1153293) +- 4.2.11 + +------------------------------------------------------------------- Old: ---- autoyast2-4.2.10.tar.bz2 New: ---- autoyast2-4.2.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.tGvkyo/_old 2019-10-21 12:26:38.483841036 +0200 +++ /var/tmp/diff_new_pack.tGvkyo/_new 2019-10-21 12:26:38.487841040 +0200 @@ -22,7 +22,7 @@ %endif Name: autoyast2 -Version: 4.2.10 +Version: 4.2.12 Release: 0 Summary: YaST2 - Automated Installation License: GPL-2.0-only @@ -59,6 +59,7 @@ %else BuildRequires: systemd %endif +BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake) Requires: autoyast2-installation = %{version} Requires: libxslt @@ -115,8 +116,8 @@ Requires: yast2-core Requires: yast2-country Requires: yast2-ncurses -# Disabling local repos in second stage only. -Requires: yast2-packager >= 4.1.33 +# Y2Packager::MediumType +Requires: yast2-packager >= 4.2.25 # ServicesManagerTargetClass::BaseTargets Requires: yast2-services-manager >= 3.1.10 # Required for one time sync before installation @@ -140,8 +141,10 @@ %prep %setup -q +%check +%yast_check + %build -%yast_build %install %yast_install @@ -153,33 +156,6 @@ %suse_update_desktop_file $d done -# Class conf -install -d -m 700 %{buildroot}%{_sysconfdir}/autoinstall -# Installation files -install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/scripts -install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/init.d -install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/logs -install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/files -install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/cache - -# Repository -install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository -install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository/templates -install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository/rules -install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository/classes -install -d %{buildroot}%{_localstatedir}/lib/autoinstall/autoconf -install -d %{buildroot}%{_localstatedir}/lib/autoinstall/tmp - -# Systemd Stuff -mkdir -p %{buildroot}%{_unitdir}/ -install -m 644 scripts/autoyast-initscripts.service %{buildroot}%{_unitdir}/ - -# Documentation -install -d -m 755 %{buildroot}%{yast_docdir}/html -tar -xvpf %{SOURCE1} -C %{buildroot}%{yast_docdir}/html -mv %{buildroot}%{yast_docdir}/html/autoyast/* %{buildroot}%{yast_docdir}/html/ -rmdir %{buildroot}%{yast_docdir}/html/autoyast - %post %{fillup_only -n autoinstall} @@ -232,11 +208,9 @@ %dir %{yast_scrconfdir} %{yast_scrconfdir}/autoinstall.scr %{yast_scrconfdir}/cfg_autoinstall.scr -# DTD files +# autoinstall modules %dir %{_datadir}/autoinstall -#%dir %{_datadir}/autoinstall/dtd %dir %{_datadir}/autoinstall/modules -#%{_datadir}/autoinstall/dtd/* # systemd service file %{_unitdir}/autoyast-initscripts.service ++++++ autoyast2-4.2.10.tar.bz2 -> autoyast2-4.2.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.10/Makefile.cvs new/autoyast2-4.2.12/Makefile.cvs --- old/autoyast2-4.2.10/Makefile.cvs 2019-10-15 13:53:22.000000000 +0200 +++ new/autoyast2-4.2.12/Makefile.cvs 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# -# Makefile.cvs -# - -LIB = $(shell y2tool get-lib) - -PREFIX = /usr - -configure: all - ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) - -all: - y2tool y2autoconf - y2tool y2automake - autoreconf --force --install - -install: configure - make - make install - -reconf: all - ./config.status --recheck - ./config.status diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.10/Rakefile new/autoyast2-4.2.12/Rakefile --- old/autoyast2-4.2.10/Rakefile 2019-10-15 13:53:22.000000000 +0200 +++ new/autoyast2-4.2.12/Rakefile 2019-10-18 17:11:04.000000000 +0200 @@ -1,6 +1,28 @@ require "yast/rake" +AUTOINST_DIR = Packaging::Configuration::DESTDIR + "/usr/share/autoinstall/" + Yast::Tasks.configuration do |conf| #lets ignore license check for now conf.skip_license_check << /.*/ + conf.install_locations["scripts/*.service"] = + Packaging::Configuration::DESTDIR + "/usr/lib/systemd/system/" + conf.install_locations["xslt/*.xslt"] = AUTOINST_DIR + "/xslt/" + conf.install_locations["modconfig/*.desktop"] = AUTOINST_DIR + "/modules/" + conf.install_locations["control/*.xml"] = Packaging::Configuration::YAST_DIR + "/control/" +end + +# define additional creation of directories during installation +task :install do + sh "/usr/bin/install -d -m 700 #{Packaging::Configuration::DESTDIR}/etc/autoinstall" + sh "/usr/bin/install -d -m 700 #{Packaging::Configuration::DESTDIR}/var/adm/autoinstall/scripts" + sh "/usr/bin/install -d -m 700 #{Packaging::Configuration::DESTDIR}/var/adm/autoinstall/init.d" + sh "/usr/bin/install -d -m 700 #{Packaging::Configuration::DESTDIR}/var/adm/autoinstall/logs" + sh "/usr/bin/install -d -m 700 #{Packaging::Configuration::DESTDIR}/var/adm/autoinstall/files" + sh "/usr/bin/install -d -m 700 #{Packaging::Configuration::DESTDIR}/var/adm/autoinstall/cache" + sh "/usr/bin/install -d -m 700 #{Packaging::Configuration::DESTDIR}/var/lib/autoinstall/repository/templates" + sh "/usr/bin/install -d -m 700 #{Packaging::Configuration::DESTDIR}/var/lib/autoinstall/repository/rules" + sh "/usr/bin/install -d -m 700 #{Packaging::Configuration::DESTDIR}/var/lib/autoinstall/repository/classes" + sh "/usr/bin/install -d -m 700 #{Packaging::Configuration::DESTDIR}/var/lib/autoinstall/autoconf" + sh "/usr/bin/install -d -m 700 #{Packaging::Configuration::DESTDIR}/var/lib/autoinstall/tmp" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.10/configure.in.in new/autoyast2-4.2.12/configure.in.in --- old/autoyast2-4.2.10/configure.in.in 2019-10-15 13:53:22.000000000 +0200 +++ new/autoyast2-4.2.12/configure.in.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -## YCP module configure.in.in - -## Initialize -@YAST2-INIT-COMMON@ -@YAST2-INIT-YCP@ - -if test "${sysconfdir}" = '${prefix}/etc'; then - sysconfdir=/etc -fi - -## some common checks -@YAST2-CHECKS-COMMON@ -@YAST2-CHECKS-YCP@ - -## and generate the output... -@YAST2-OUTPUT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.10/control/Makefile.am new/autoyast2-4.2.12/control/Makefile.am --- old/autoyast2-4.2.10/control/Makefile.am 2019-10-15 13:53:22.000000000 +0200 +++ new/autoyast2-4.2.12/control/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -# -# Makefile.am for y2c_autoinst/src -# -# $Id$ -# -controldir = $(yast2dir)/control - -control_DATA = \ - control_continue_autoyast.xml - -EXTRA_DIST = \ - $(control_DATA) - -check-local: - xmllint --relaxng $(controldir)/control.rng --noout $(control_DATA) - -include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.10/modconfig/Makefile.am new/autoyast2-4.2.12/modconfig/Makefile.am --- old/autoyast2-4.2.10/modconfig/Makefile.am 2019-10-15 13:53:22.000000000 +0200 +++ new/autoyast2-4.2.12/modconfig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -# -# Makefile.am for y2c_autoinst/src/config -# -# $Id$ -# - -modconfigdir = $(prefix)/share/autoinstall/modules -modconfig_DATA = \ - partitioning.desktop \ - general.desktop \ - report.desktop \ - scripts.desktop \ - software.desktop \ - files.desktop - -EXTRA_DIST = $(modconfig_DATA) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.10/package/autoyast2.changes new/autoyast2-4.2.12/package/autoyast2.changes --- old/autoyast2-4.2.10/package/autoyast2.changes 2019-10-15 13:53:22.000000000 +0200 +++ new/autoyast2-4.2.12/package/autoyast2.changes 2019-10-18 17:11:04.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Fri Oct 18 14:03:27 UTC 2019 - Ladislav Slezák <[email protected]> + +- AutoYaST support for the OnlineOnly installation medium + (jsc#SLE-7214) +- 4.2.12 + +------------------------------------------------------------------- +Wed Oct 16 11:36:17 UTC 2019 - Ladislav Slezák <[email protected]> + +- Do not run the registration step again in the installed system + (in the 2nd stage after reboot) (bsc#1153293) +- 4.2.11 + +------------------------------------------------------------------- Tue Oct 15 11:37:54 UTC 2019 - Josef Reidinger <[email protected]> - Fix dependency for autoyast2-installation (bsc#1131235) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.10/package/autoyast2.spec new/autoyast2-4.2.12/package/autoyast2.spec --- old/autoyast2-4.2.10/package/autoyast2.spec 2019-10-15 13:53:22.000000000 +0200 +++ new/autoyast2-4.2.12/package/autoyast2.spec 2019-10-18 17:11:04.000000000 +0200 @@ -22,7 +22,7 @@ %endif Name: autoyast2 -Version: 4.2.10 +Version: 4.2.12 Release: 0 Summary: YaST2 - Automated Installation License: GPL-2.0-only @@ -59,6 +59,7 @@ %else BuildRequires: systemd %endif +BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake) Requires: autoyast2-installation = %{version} Requires: libxslt @@ -115,8 +116,8 @@ Requires: yast2-core Requires: yast2-country Requires: yast2-ncurses -# Disabling local repos in second stage only. -Requires: yast2-packager >= 4.1.33 +# Y2Packager::MediumType +Requires: yast2-packager >= 4.2.25 # ServicesManagerTargetClass::BaseTargets Requires: yast2-services-manager >= 3.1.10 # Required for one time sync before installation @@ -140,8 +141,10 @@ %prep %setup -q +%check +%yast_check + %build -%yast_build %install %yast_install @@ -153,33 +156,6 @@ %suse_update_desktop_file $d done -# Class conf -install -d -m 700 %{buildroot}%{_sysconfdir}/autoinstall -# Installation files -install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/scripts -install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/init.d -install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/logs -install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/files -install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/cache - -# Repository -install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository -install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository/templates -install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository/rules -install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository/classes -install -d %{buildroot}%{_localstatedir}/lib/autoinstall/autoconf -install -d %{buildroot}%{_localstatedir}/lib/autoinstall/tmp - -# Systemd Stuff -mkdir -p %{buildroot}%{_unitdir}/ -install -m 644 scripts/autoyast-initscripts.service %{buildroot}%{_unitdir}/ - -# Documentation -install -d -m 755 %{buildroot}%{yast_docdir}/html -tar -xvpf %{SOURCE1} -C %{buildroot}%{yast_docdir}/html -mv %{buildroot}%{yast_docdir}/html/autoyast/* %{buildroot}%{yast_docdir}/html/ -rmdir %{buildroot}%{yast_docdir}/html/autoyast - %post %{fillup_only -n autoinstall} @@ -232,11 +208,9 @@ %dir %{yast_scrconfdir} %{yast_scrconfdir}/autoinstall.scr %{yast_scrconfdir}/cfg_autoinstall.scr -# DTD files +# autoinstall modules %dir %{_datadir}/autoinstall -#%dir %{_datadir}/autoinstall/dtd %dir %{_datadir}/autoinstall/modules -#%{_datadir}/autoinstall/dtd/* # systemd service file %{_unitdir}/autoyast-initscripts.service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.10/scripts/Makefile.am new/autoyast2-4.2.12/scripts/Makefile.am --- old/autoyast2-4.2.10/scripts/Makefile.am 2019-10-15 13:53:22.000000000 +0200 +++ new/autoyast2-4.2.12/scripts/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -# -# Makefile.am for installation/scripts -# - -EXTRA_DIST = autoyast-initscripts.service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.10/src/Makefile.am new/autoyast2-4.2.12/src/Makefile.am --- old/autoyast2-4.2.10/src/Makefile.am 2019-10-15 13:53:22.000000000 +0200 +++ new/autoyast2-4.2.12/src/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,137 +0,0 @@ -# Sources for autoinstallation - -module_DATA = \ - modules/AutoinstStorage.rb \ - modules/AutoinstPartPlan.rb \ - modules/AutoInstallRules.rb \ - modules/Y2ModuleConfig.rb \ - modules/ProfileLocation.rb \ - modules/AutoinstPartition.rb \ - modules/AutoinstClone.rb \ - modules/AutoinstImage.rb \ - modules/AutoinstConfig.rb \ - modules/Profile.rb \ - modules/AutoinstCommon.rb \ - modules/AutoinstFile.rb \ - modules/AutoinstScripts.rb \ - modules/AutoInstall.rb \ - modules/AutoinstGeneral.rb \ - modules/AutoinstSoftware.rb \ - modules/AutoinstDrive.rb \ - modules/AutoinstClass.rb \ - modules/AutoinstFunctions.rb - -client_DATA = \ - clients/classes_auto.rb \ - clients/ayast_setup.rb \ - clients/scripts_auto.rb \ - clients/software_auto.rb \ - clients/general_auto.rb \ - clients/inst_autopost.rb \ - clients/storage_auto.rb \ - clients/ayast_probe.rb \ - clients/inst_autoconfigure.rb \ - clients/inst_autosetup_upgrade.rb \ - clients/autoinst_scripts2_finish.rb \ - clients/inst_autosetup.rb \ - clients/inst_autoinit.rb \ - clients/report_auto.rb \ - clients/autoinst_scripts1_finish.rb \ - clients/inst_autoimage.rb \ - clients/inst_store_upgrade_software.rb \ - clients/files_auto.rb \ - clients/autoinst_test_clone.rb \ - clients/autoyast.rb \ - clients/clone_system.rb \ - clients/autoinst_test_stage.rb - -yncludedir = @yncludedir@/autoinstall -ynclude_DATA = \ - include/autoinstall/DriveDialog.rb \ - include/autoinstall/io.rb \ - include/autoinstall/wizards.rb \ - include/autoinstall/autoinst_dialogs.rb \ - include/autoinstall/classes.rb \ - include/autoinstall/types.rb \ - include/autoinstall/PartitionDialog.rb \ - include/autoinstall/StorageDialog.rb \ - include/autoinstall/tree.rb \ - include/autoinstall/common.rb \ - include/autoinstall/dialogs.rb \ - include/autoinstall/AdvancedPartitionDialog.rb \ - include/autoinstall/ask.rb \ - include/autoinstall/VolgroupDialog.rb \ - include/autoinstall/xml.rb \ - include/autoinstall/script_dialogs.rb \ - include/autoinstall/conftree.rb \ - include/autoinstall/helps.rb \ - include/autoinstall/general_dialogs.rb - -ylibdir = @ylibdir@/autoinstall -ylib_DATA = \ - lib/autoinstall/activate_callbacks.rb \ - lib/autoinstall/module_config_builder.rb \ - lib/autoinstall/pkg_gpg_check_handler.rb \ - lib/autoinstall/partitioning_preprocessor.rb \ - lib/autoinstall/autosetup_helpers.rb \ - lib/autoinstall/storage_proposal.rb \ - lib/autoinstall/autoinst_issues_presenter.rb \ - lib/autoinstall/autoinst_issues.rb \ - lib/autoinstall/storage_proposal_issues_presenter.rb - -ydialogsdir = @ylibdir@/autoinstall/dialogs -ydialogs_DATA = \ - lib/autoinstall/dialogs/disk_selector.rb \ - lib/autoinstall/dialogs/question.rb - -yclientsdir = @ylibdir@/autoinstall/clients -yclients_DATA = \ - lib/autoinstall/clients/ayast_probe.rb - -ycautoinst_issuesdir = @ylibdir@/autoinstall/autoinst_issues -ycautoinst_issues_DATA = \ - lib/autoinstall/autoinst_issues/invalid_value.rb \ - lib/autoinstall/autoinst_issues/issue.rb \ - lib/autoinstall/autoinst_issues/list.rb \ - lib/autoinstall/autoinst_issues/missing_value.rb - -scrconf_DATA = \ - scrconf/cfg_autoinstall.scr \ - scrconf/autoinstall.scr - -schemafilesdir = $(schemadir)/autoyast/rnc -schemafiles_DATA = \ - autoyast-rnc/scripts.rnc \ - autoyast-rnc/rules.rnc \ - autoyast-rnc/common.rnc \ - autoyast-rnc/pxe.rnc \ - autoyast-rnc/classes-use.rnc \ - autoyast-rnc/classes-decl.rnc \ - autoyast-rnc/software.rnc \ - autoyast-rnc/reporting.rnc \ - autoyast-rnc/partitioning.rnc \ - autoyast-rnc/profile-misc.rnc \ - autoyast-rnc/general.rnc \ - autoyast-rnc/files.rnc - -ybin_SCRIPTS = \ - bin/autoyast-initscripts.sh \ - bin/fetch_image.sh - -desktop_DATA = \ - desktop/org.opensuse.yast.AutoYaST.desktop \ - desktop/org.opensuse.yast.CloneSystem.desktop - -fillup_DATA = \ - fillup/sysconfig.autoinstall - -symbolicdir = @icondir@/hicolor/symbolic/apps -symbolic_DATA = \ - icons/hicolor/symbolic/apps/yast-autoyast-symbolic.svg -scalabledir = @icondir@/hicolor/scalable/apps -scalable_DATA = \ - icons/hicolor/scalable/apps/yast-autoyast.svg - -EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(ybin_SCRIPTS) $(desktop_DATA) $(fillup_DATA) $(ylib_DATA) $(ydialogs_DATA) $(yclients_DATA) $(symbolic_DATA) $(scalable_DATA) - -include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.10/src/clients/inst_autoinit.rb new/autoyast2-4.2.12/src/clients/inst_autoinit.rb --- old/autoyast2-4.2.10/src/clients/inst_autoinit.rb 2019-10-15 13:53:22.000000000 +0200 +++ new/autoyast2-4.2.12/src/clients/inst_autoinit.rb 2019-10-18 17:11:04.000000000 +0200 @@ -7,9 +7,15 @@ # # $Id$ # + +require "autoinstall/autosetup_helpers" +require "y2packager/medium_type" + module Yast class InstAutoinitClient < Client + include Y2Autoinstallation::AutosetupHelpers include Yast::Logger + def main Yast.import "UI" @@ -86,6 +92,14 @@ Progress.Finish + # when installing from the online installation medium we need to + # register the system earlier because the medium does not contain any + # repositories, we need the repositories from the registration server + # TODO: maybe we will need it also in the autoupgrade case... + if Y2Packager::MediumType.online? && !Mode.autoupgrade + suse_register + end + if !(Mode.autoupgrade && AutoinstConfig.ProfileInRootPart) @ret = WFM.CallFunction("inst_system_analysis", []) return @ret if @ret == :abort diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.10/src/lib/autoinstall/autosetup_helpers.rb new/autoyast2-4.2.12/src/lib/autoinstall/autosetup_helpers.rb --- old/autoyast2-4.2.10/src/lib/autoinstall/autosetup_helpers.rb 2019-10-15 13:53:22.000000000 +0200 +++ new/autoyast2-4.2.12/src/lib/autoinstall/autosetup_helpers.rb 2019-10-18 17:11:04.000000000 +0200 @@ -29,6 +29,10 @@ # and {Yast::InstAutosetupUpgradeClient} clients. These clients need to be rewritten # but, for the time being, this is the easiest way to share code between them. module AutosetupHelpers + + # name of the registration section in the profile + REGISTER_SECTION = "suse_register" + # Activate and probe storage def probe_storage Y2Storage::StorageManager.instance.activate(Y2Autoinstallation::ActivateCallbacks.new) @@ -80,15 +84,19 @@ def suse_register return true unless registration_module_available? # do nothing general_section = Yast::Profile.current["general"] || {} - if Yast::Profile.current["suse_register"] + if Yast::Profile.current[REGISTER_SECTION] return false unless Yast::WFM.CallFunction( "scc_auto", - ["Import", Yast::Profile.current["suse_register"]] + ["Import", Yast::Profile.current[REGISTER_SECTION]] ) return false unless Yast::WFM.CallFunction( "scc_auto", ["Write"] ) + + # remove the registration section to not run it again in the 2nd stage + Yast::Profile.remove_sections(REGISTER_SECTION) + # failed relnotes download is not fatal, ignore ret code Yast::WFM.CallFunction("inst_download_release_notes") elsif general_section["semi-automatic"] && diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.10/test/Makefile.am new/autoyast2-4.2.12/test/Makefile.am --- old/autoyast2-4.2.10/test/Makefile.am 2019-10-15 13:53:22.000000000 +0200 +++ new/autoyast2-4.2.12/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -# -# Makefile.am for autoinstallation/test -# - -TESTS = \ - AutoInstallRules_test.rb \ - AutoInstall_test.rb \ - AutoinstClass_test.rb \ - AutoinstConfig_test.rb \ - AutoinstFunctions_test.rb \ - AutoinstGeneral_test.rb \ - AutoinstPartPlan_test.rb \ - AutoinstSoftware_test.rb \ - ProfileLocation_test.rb \ - autoinst_storage_test.rb \ - profile_test.rb \ - Y2ModuleConfig_test.rb \ - include/ask_test.rb \ - lib/activate_callbacks_test.rb \ - lib/module_config_builder_test.rb \ - lib/pkg_gpg_check_handler_test.rb \ - lib/partitioning_preprocessor_test.rb \ - lib/storage_proposal_issues_presenter_test.rb \ - lib/storage_proposal_test.rb \ - lib/clients/ayast_probe_test.rb \ - lib/dialogs/disk_selector_test.rb \ - lib/dialogs/question_test.rb - -TEST_EXTENSIONS = .rb -RB_LOG_COMPILER = rspec -VERBOSE = 1 -EXTRA_DIST = $(TESTS) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.10/test/lib/autosetup_helpers_test.rb new/autoyast2-4.2.12/test/lib/autosetup_helpers_test.rb --- old/autoyast2-4.2.10/test/lib/autosetup_helpers_test.rb 2019-10-15 13:53:22.000000000 +0200 +++ new/autoyast2-4.2.12/test/lib/autosetup_helpers_test.rb 2019-10-18 17:11:04.000000000 +0200 @@ -58,6 +58,7 @@ allow_any_instance_of(Y2Autoinstallation::AutosetupHelpers).to receive( :registration_module_available?).and_return(reg_module_available) allow(Yast::Profile).to receive(:current).and_return(profile_content) + allow(Yast::Profile).to receive(:remove_sections).with("suse_register") end context "yast2-register is not available" do @@ -101,6 +102,12 @@ client.suse_register end + # bsc#1153293 + it "removes the registration section to not run it again in the 2nd stage" do + expect(Yast::Profile).to receive(:remove_sections).with("suse_register") + client.suse_register + end + it "returns true" do expect(client.suse_register).to eq(true) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.10/xslt/Makefile.am new/autoyast2-4.2.12/xslt/Makefile.am --- old/autoyast2-4.2.10/xslt/Makefile.am 2019-10-15 13:53:22.000000000 +0200 +++ new/autoyast2-4.2.12/xslt/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -# -# Makefile.am for autoinstallation/src/data -# -# $Id$ -# - -SUBDIRS = - -xmldir = $(prefix)/share/autoinstall/xslt - - -xml_DATA = \ - merge.xslt - -EXTRA_DIST = $(xml_DATA) $(fillup_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.10/xslt/dtd/Makefile.am new/autoyast2-4.2.12/xslt/dtd/Makefile.am --- old/autoyast2-4.2.10/xslt/dtd/Makefile.am 2019-10-15 13:53:22.000000000 +0200 +++ new/autoyast2-4.2.12/xslt/dtd/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -# -# Makefile.am for y2c_autoinst/src -# -# $Id$ -# - -dtddir = $(prefix)/share/autoinstall/dtd - -dtd_DATA = $(wildcard *.dtd) - -#EXTRA_DIST = $(dtd_DATA) -EXTRA_DIST = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.10/xslt/rng/Makefile.am new/autoyast2-4.2.12/xslt/rng/Makefile.am --- old/autoyast2-4.2.10/xslt/rng/Makefile.am 2019-10-15 13:53:22.000000000 +0200 +++ new/autoyast2-4.2.12/xslt/rng/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -# -# Makefile.am for y2c_autoinst/src -# -# $Id$ -# - -# THESE FILES ARE NOT USED -# and should be moved to their respective modules, -# see /usr/share/doc/packages/yast2-schema/yast2-schema - -# see also ../../schema - -rncdir = $(prefix)/share/autoinstall/rnc - -rnc_DATA = \ - samba.rnc \ - sound.rnc - -EXTRA_DIST = $(rnc_DATA)
