January 2014 - YaST Commits - openSUSE Mailing Lists

[yast-commit] [ci_new_pac] JFYI skelcd-control-SLES -> sle12
by ro 29 Jan '14

29 Jan '14

Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/skelcd-control-SLES -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/skelcd-control-SLES/skelcd-control-SLES.changes 2014-01-28 14:07:26.000000000 +0100 +++ /mounts/work_src_done/SLE12/skelcd-control-SLES/skelcd-control-SLES.changes 2014-01-29 13:27:31.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 29 11:47:48 UTC 2014 - lslezak(a)suse.cz + +- install LICENSE (to pass the build service check) +- 12.0.4 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - skelcd-control-SLES ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/skelcd-control-SLES (Old) and /mounts/work_src_done/SLE12/skelcd-control-SLES (BS:build ID:31297 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "skelcd-control-SLES", Maintainer is "yast-commit(a)opensuse.org" Old: ---- skelcd-control-SLES-12.0.3.tar.bz2 New: ---- skelcd-control-SLES-12.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-control-SLES.spec ++++++ --- /var/tmp/diff_new_pack.nLAJos/_old 2014-01-29 14:25:15.000000000 +0100 +++ /var/tmp/diff_new_pack.nLAJos/_new 2014-01-29 14:25:15.000000000 +0100 @@ -48,6 +48,8 @@ # Generic Yast packages needed for the installer Requires: autoyast2-installation Requires: yast2-add-on +Requires: yast2-buildtools +Requires: yast2-devtools Requires: yast2-fcoe-client Requires: yast2-iscsi-client Requires: yast2-kdump @@ -66,6 +68,7 @@ Requires: yast2-x11 # this is the default theme Requires: yast2-theme-openSUSE-Oxygen +Requires: yast2-qt-branding-openSUSE # Architecture specific packages # @@ -82,7 +85,7 @@ Url: https://github.com/yast/skelcd-control-SLES AutoReqProv: off -Version: 12.0.3 +Version: 12.0.4 Release: 0 Summary: SLES control file needed for installation License: MIT @@ -110,8 +113,14 @@ mkdir -p $RPM_BUILD_ROOT/CD1 install -m 644 control/control.SLES.xml $RPM_BUILD_ROOT/CD1/control.xml +# install LICENSE (required by build service check) +mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/%{name} +install -m 644 LICENSE $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/%{name} + %files %defattr(644,root,root,755) /CD1 +%doc %dir %{_prefix}/share/doc/packages/%{name} +%doc %{_prefix}/share/doc/packages/%{name}/LICENSE %changelog ++++++ skelcd-control-SLES-12.0.3.tar.bz2 -> skelcd-control-SLES-12.0.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-SLES-12.0.3/package/skelcd-control-SLES.changes new/skelcd-control-SLES-12.0.4/package/skelcd-control-SLES.changes --- old/skelcd-control-SLES-12.0.3/package/skelcd-control-SLES.changes 2014-01-28 11:36:45.000000000 +0100 +++ new/skelcd-control-SLES-12.0.4/package/skelcd-control-SLES.changes 2014-01-29 13:26:44.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 29 11:47:48 UTC 2014 - lslezak(a)suse.cz + +- install LICENSE (to pass the build service check) +- 12.0.4 + +------------------------------------------------------------------- Fri Jan 24 17:44:48 UTC 2014 - lslezak(a)suse.cz - added yast2-registration to Requires to add it into SLES inst-sys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-SLES-12.0.3/package/skelcd-control-SLES.spec new/skelcd-control-SLES-12.0.4/package/skelcd-control-SLES.spec --- old/skelcd-control-SLES-12.0.3/package/skelcd-control-SLES.spec 2014-01-28 11:36:45.000000000 +0100 +++ new/skelcd-control-SLES-12.0.4/package/skelcd-control-SLES.spec 2014-01-29 13:26:44.000000000 +0100 @@ -48,6 +48,8 @@ # Generic Yast packages needed for the installer Requires: autoyast2-installation Requires: yast2-add-on +Requires: yast2-buildtools +Requires: yast2-devtools Requires: yast2-fcoe-client Requires: yast2-iscsi-client Requires: yast2-kdump @@ -66,6 +68,7 @@ Requires: yast2-x11 # this is the default theme Requires: yast2-theme-openSUSE-Oxygen +Requires: yast2-qt-branding-openSUSE # Architecture specific packages # @@ -82,7 +85,7 @@ Url: https://github.com/yast/skelcd-control-SLES AutoReqProv: off -Version: 12.0.3 +Version: 12.0.4 Release: 0 Summary: SLES control file needed for installation License: MIT @@ -110,8 +113,14 @@ mkdir -p $RPM_BUILD_ROOT/CD1 install -m 644 control/control.SLES.xml $RPM_BUILD_ROOT/CD1/control.xml +# install LICENSE (required by build service check) +mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/%{name} +install -m 644 LICENSE $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/%{name} + %files %defattr(644,root,root,755) /CD1 +%doc %dir %{_prefix}/share/doc/packages/%{name} +%doc %{_prefix}/share/doc/packages/%{name}/LICENSE %changelog continue with "q"... Checked in at Wed Jan 29 14:25:31 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] [ci_new_pac] JFYI skelcd-control-SLED -> sle12
by ro 29 Jan '14

29 Jan '14

Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/skelcd-control-SLED -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/skelcd-control-SLED/skelcd-control-SLED.changes 2014-01-17 14:11:56.000000000 +0100 +++ /mounts/work_src_done/SLE12/skelcd-control-SLED/skelcd-control-SLED.changes 2014-01-29 13:27:00.000000000 +0100 @@ -1,0 +2,43 @@ +Wed Jan 29 11:47:48 UTC 2014 - lslezak(a)suse.cz + +- install LICENSE (to pass the build service check) +- added some missing Yast dependencies +- 12.0.4 + +------------------------------------------------------------------- +Fri Jan 24 17:44:48 UTC 2014 - lslezak(a)suse.cz + +- added yast2-registration to Requires to add it into SLED inst-sys +- 12.0.3 + +------------------------------------------------------------------- +Fri Jan 24 14:55:15 UTC 2014 - jreidinger(a)suse.com + +- add same firewall proposal as opensuse have +- 12.0.2 + +------------------------------------------------------------------- +Thu Jan 23 16:52:06 UTC 2014 - lslezak(a)suse.cz + +- added registration and root password to live installation +- move "system" item in the installation proposal to bottom +- 12.0.1 + +------------------------------------------------------------------- +Thu Jan 23 13:32:42 UTC 2014 - jsrain(a)suse.cz + +- adjusted live workflow according to new installer (no 2nd stage) + (fate#316202) + +------------------------------------------------------------------- +Fri Jan 17 14:22:08 UTC 2014 - lslezak(a)suse.cz + +- the development has been moved to Yast Gihub + (https://github.com/yast/skelcd-control-SLED), + the package is autosumbmitted by Jenkins CI +- removed "magic" get_version_number.sh script (use static + versioning as usual) (the script was not compatible with Yast + workflow at Jenkins) +- version 12.0.0 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - skelcd-control-SLED ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/skelcd-control-SLED (Old) and /mounts/work_src_done/SLE12/skelcd-control-SLED (BS:build ID:31296 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "skelcd-control-SLED", Maintainer is "yast-commit(a)opensuse.org" Old: ---- control.xml get_version_number.sh New: ---- skelcd-control-SLED-12.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-control-SLED.spec ++++++ --- /var/tmp/diff_new_pack.ir8Zpa/_old 2014-01-29 14:24:44.000000000 +0100 +++ /var/tmp/diff_new_pack.ir8Zpa/_new 2014-01-29 14:24:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package skelcd-control-SLED # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,50 +15,110 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild +###################################################################### +# +# IMPORTANT: Please do not change the control file or this spec file +# in build service directly, use +# https://github.com/yast/skelcd-control-SLED repository +# +# See https://github.com/yast/skelcd-control-SLED/blob/master/CONTRIBUTING.md +# for more details. +# +###################################################################### Name: skelcd-control-SLED Summary: SLED control file needed for installation +License: MIT +Group: Metapackages BuildRequires: libxml2-tools # new global option - FATE #305583 BuildRequires: yast2-installation-control -Url: http://www.suse.com/ -License: YaST License -Group: Metapackages + +###################################################################### +# +# Here is the list of Yast packages which are needed in the +# installation system (inst-sys) for the Yast installer +# + +# SLES specific Yast packages needed in the inst-sys +# to provide the functionality needed by this control file +Requires: yast2-registration +Requires: yast2-theme-SLE + +# Generic Yast packages needed for the installer +Requires: autoyast2-installation +Requires: yast2-add-on +Requires: yast2-buildtools +Requires: yast2-devtools +Requires: yast2-fcoe-client +Requires: yast2-iscsi-client +Requires: yast2-kdump +Requires: yast2-multipath +Requires: yast2-network +Requires: yast2-nfs-client +Requires: yast2-ntp-client +Requires: yast2-proxy +Requires: yast2-services-manager +Requires: yast2-slp +Requires: yast2-trans-allpacks +Requires: yast2-trans-stats +Requires: yast2-tune +Requires: yast2-update +Requires: yast2-users +Requires: yast2-x11 +# this is the default theme +Requires: yast2-theme-openSUSE-Oxygen +Requires: yast2-qt-branding-openSUSE + +# Architecture specific packages +# +%ifarch s390 s390x +BuildRequires: yast2-reipl +%endif + +%ifarch %ix86 x86_64 +BuildRequires: yast2-vm +%endif + +# +###################################################################### + +Url: https://github.com/yast/skelcd-control-SLED AutoReqProv: off -Version: 2013.5.29 -Release: 0.<RELEASE7> -Provides: skelcd-control-SLD = 2008.8.14 -Obsoletes: skelcd-control-SLD < 2008.8.14 +Version: 12.0.4 +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: control.xml +Source: %{name}-%{version}.tar.bz2 %description SLED control file needed for installation +%prep +%setup -n %{name}-%{version} -Authors: --------- - Anas Nashif<nashif(a)suse.de> - Jiri Srain <jsrain(a)suse.cz> - -%prep +%check +# +# Verify syntax +# +make -C control check %install # # Add control file # mkdir -p $RPM_BUILD_ROOT/CD1 -# -# Verify syntax -# -xmllint --noout --relaxng /usr/share/YaST2/control/control.rng $RPM_SOURCE_DIR/control.xml -cp $RPM_SOURCE_DIR/control.xml $RPM_BUILD_ROOT/CD1/ +install -m 644 control/control.SLED.xml $RPM_BUILD_ROOT/CD1/control.xml + +# install LICENSE (required by build service check) +mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/%{name} +install -m 644 LICENSE $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/%{name} %files %defattr(644,root,root,755) /CD1 +%doc %dir %{_prefix}/share/doc/packages/%{name} +%doc %{_prefix}/share/doc/packages/%{name}/LICENSE %changelog continue with "q"... Checked in at Wed Jan 29 14:25:10 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] Request 31273 changed to accepted (submit SUSE:SLE-12:GA/autoyast2)
by Ruediger Oertel 29 Jan '14

29 Jan '14

Visit https://build.suse.de/request/show/31273 State of request 31273 was changed by oertel: new -> accepted Comment: Accepted submit request 31273 from user leonardocf Actions: - submit Devel:YaST:Head/autoyast2 => SUSE:SLE-12:GA/autoyast2 -- Configure notifications at https://build.suse.de/user/notifications SUSE Internal OBS Instance (https://build.suse.de/) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] [ci_new_pac] JFYI autoyast2 -> sle12
by ro 29 Jan '14

29 Jan '14

Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/autoyast2 -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/autoyast2/autoyast2.changes 2014-01-17 14:01:51.000000000 +0100 +++ /mounts/work_src_done/SLE12/autoyast2/autoyast2.changes 2014-01-28 19:21:07.000000000 +0100 @@ -1,0 +2,20 @@ +Tue Jan 28 17:37:57 UTC 2014 - jreidinger(a)suse.com + +- In first stage export only proposed values without reading from + system (FATE#308539) +- 3.1.10 + +------------------------------------------------------------------- +Tue Jan 28 15:36:12 UTC 2014 - jreidinger(a)suse.com + +- Fix export in first stage (FATE#308539) +- 3.1.9 + +------------------------------------------------------------------- +Fri Jan 24 15:38:20 UTC 2014 - jreidinger(a)suse.com + +- add support for semi-automatic installation for partitioning + (FATE#314695) +- 3.1.8 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - autoyast2 - installation-images - installation-images-extras - yast2-product-creator - yast2-schema ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/autoyast2 (Old) and /mounts/work_src_done/SLE12/autoyast2 (BS:build ID:31273 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autoyast2", Maintainer is "yast-commit(a)opensuse.org" Old: ---- autoyast2-3.1.7.tar.bz2 New: ---- autoyast2-3.1.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.Uw2TRs/_old 2014-01-29 12:48:59.000000000 +0100 +++ /var/tmp/diff_new_pack.Uw2TRs/_new 2014-01-29 12:48:59.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package autoyast2 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products 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.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:41.000000000 +0100 @@ -1,4 +1,24 @@ ------------------------------------------------------------------- +Tue Jan 28 17:37:57 UTC 2014 - jreidinger(a)suse.com + +- In first stage export only proposed values without reading from + system (FATE#308539) +- 3.1.10 + +------------------------------------------------------------------- +Tue Jan 28 15:36:12 UTC 2014 - jreidinger(a)suse.com + +- Fix export in first stage (FATE#308539) +- 3.1.9 + +------------------------------------------------------------------- +Fri Jan 24 15:38:20 UTC 2014 - jreidinger(a)suse.com + +- add support for semi-automatic installation for partitioning + (FATE#314695) +- 3.1.8 + +------------------------------------------------------------------- Thu Jan 9 19:38:09 CET 2014 - fehr(a)suse.de - 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:41.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:41.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:41.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:41.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:41.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 continue with "q"... Checked in at Wed Jan 29 12:49:16 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] Request 215252 changed to accepted (submit openSUSE:Factory/yast2-nfs-server)
by Stephan Kulow 29 Jan '14

29 Jan '14

Visit https://build.opensuse.org/request/show/215252 State of request 215252 was changed by coolo: new -> accepted Comment: checkin Actions: - submit YaST:Head/yast2-nfs-server => openSUSE:Factory/yast2-nfs-server -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] Request 215397 changed to accepted (submit openSUSE:Factory/yast2-installation)
by Stephan Kulow 29 Jan '14

29 Jan '14

Visit https://build.opensuse.org/request/show/215397 State of request 215397 was changed by coolo: new -> accepted Comment: checkin Actions: - submit YaST:Head/yast2-installation => openSUSE:Factory/yast2-installation -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] Request 215412 changed to accepted (submit openSUSE:Factory/autoyast2)
by Stephan Kulow 29 Jan '14

29 Jan '14

Visit https://build.opensuse.org/request/show/215412 State of request 215412 was changed by coolo: new -> accepted Comment: checkin Actions: - submit YaST:Head/autoyast2 => openSUSE:Factory/autoyast2 -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] [yast/yast-autoinstallation]
by GitHub 28 Jan '14

28 Jan '14

Branch: refs/heads/export_proposal_first_stage Home: https://github.com/yast/yast-autoinstallation

1 0

[yast-commit] [yast/yast-autoinstallation] 1f229c: In first stage export only proposed values without...
by GitHub 28 Jan '14

28 Jan '14

Branch: refs/heads/master Home: https://github.com/yast/yast-autoinstallation Commit: 1f229c3733d85bd5188e0b8506786003d2226dbd https://github.com/yast/yast-autoinstallation/commit/1f229c3733d85bd5188e0b… Author: Josef Reidinger <jreidinger(a)suse.cz> Date: 2014-01-28 (Tue, 28 Jan 2014) Changed paths: M src/modules/AutoinstClone.rb Log Message: ----------- In first stage export only proposed values without reading from system (FATE#308539) Commit: bff0eda07002512c59b440f696975467d80d972c https://github.com/yast/yast-autoinstallation/commit/bff0eda07002512c59b440… Author: Josef Reidinger <jreidinger(a)suse.cz> Date: 2014-01-28 (Tue, 28 Jan 2014) Changed paths: M package/autoyast2.changes M package/autoyast2.spec Log Message: ----------- release Commit: 0a6213bd8261390521d39db5dd35d81ee39cbc2b https://github.com/yast/yast-autoinstallation/commit/0a6213bd8261390521d39d… Author: Josef Reidinger <jreidinger(a)suse.cz> Date: 2014-01-28 (Tue, 28 Jan 2014) Changed paths: M package/autoyast2.changes M package/autoyast2.spec M src/modules/AutoinstClone.rb Log Message: ----------- Merge pull request #26 from yast/export_proposal_first_stage Export proposal first stage Compare: https://github.com/yast/yast-autoinstallation/compare/48a78898bd28...0a6213…

1 0

[yast-commit] [yast/yast-autoinstallation] 1f229c: In first stage export only proposed values without...
by GitHub 28 Jan '14

28 Jan '14

Branch: refs/heads/export_proposal_first_stage Home: https://github.com/yast/yast-autoinstallation Commit: 1f229c3733d85bd5188e0b8506786003d2226dbd https://github.com/yast/yast-autoinstallation/commit/1f229c3733d85bd5188e0b… Author: Josef Reidinger <jreidinger(a)suse.cz> Date: 2014-01-28 (Tue, 28 Jan 2014) Changed paths: M src/modules/AutoinstClone.rb Log Message: ----------- In first stage export only proposed values without reading from system (FATE#308539) Commit: bff0eda07002512c59b440f696975467d80d972c https://github.com/yast/yast-autoinstallation/commit/bff0eda07002512c59b440… Author: Josef Reidinger <jreidinger(a)suse.cz> Date: 2014-01-28 (Tue, 28 Jan 2014) Changed paths: M package/autoyast2.changes M package/autoyast2.spec Log Message: ----------- release Compare: https://github.com/yast/yast-autoinstallation/compare/1f229c3733d8^...bff0e…

1 0