January 2014 - YaST Development - openSUSE Mailing Lists

[yast-devel] [ci_new_pac] JFYI yast2-storage -> sle12
by ro 27 Jan '14

27 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/yast2-storage -> sle12 ## BNC# 853930 : "installer defaults to btrfs but zipl does not support it" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-storage/yast2-storage.changes 2014-01-17 14:16:34.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-storage/yast2-storage.changes 2014-01-23 16:26:26.000000000 +0100 @@ -1,0 +2,23 @@ +Tue Jan 21 11:31:36 UTC 2014 - jsrain(a)suse.cz + +- propose dedicated /boot/zipl partition on S/390 (bnc#853930) +- version 3.1.6 + +------------------------------------------------------------------- +Mon Jan 20 11:26:44 CET 2014 - aschnell(a)suse.de + +- don't create home subvolume if a home partition is proposed + +------------------------------------------------------------------- +Fri Jan 17 14:52:02 CET 2014 - aschnell(a)suse.de + +- allow to disable automatic snapshots for btrfs in proposal and + expert partitioner (fate#316221) + +------------------------------------------------------------------- +Tue Jan 14 17:47:23 CET 2014 - aschnell(a)suse.de + +- allow to choose filesystem for root and home in proposal + (fate#316637) + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-storage - at least 23 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-storage (Old) and /mounts/work_src_done/SLE12/yast2-storage (BS:build ID:31197 MAIL:yast-devel@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-storage", Maintainer is "yast-devel(a)opensuse.org" Old: ---- yast2-storage-3.1.5.tar.bz2 New: ---- yast2-storage-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.PzA934/_old 2014-01-27 16:09:35.000000000 +0100 +++ /var/tmp/diff_new_pack.PzA934/_new 2014-01-27 16:09:35.000000000 +0100 @@ -17,45 +17,37 @@ Name: yast2-storage -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -BuildRequires: docbook-xsl-stylesheets -BuildRequires: doxygen -BuildRequires: gcc-c++ -BuildRequires: libstorage-devel >= 2.25.4 -BuildRequires: libstorage-ruby >= 2.25.4 -BuildRequires: libtool -BuildRequires: libxslt -BuildRequires: perl-XML-Writer -BuildRequires: rubygem-ruby-dbus -BuildRequires: sgml-skel -BuildRequires: update-desktop-files +Group: System/YaST +License: GPL-2.0 + +BuildRequires: gcc-c++ libtool +BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files +BuildRequires: libstorage-devel >= 2.25.7 BuildRequires: yast2 >= 2.19.4 BuildRequires: yast2-core-devel >= 2.23.1 BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-testsuite >= 2.19.0 -Requires: libstorage-ruby >= 2.25.4 -Requires: libstorage5 >= 2.25.4 +BuildRequires: rubygem-ruby-dbus +BuildRequires: rubygem-rspec +BuildRequires: libstorage-ruby >= 2.25.7 +Requires: libstorage5 >= 2.25.7 +Requires: libstorage-ruby >= 2.25.7 +Requires: yast2-core >= 2.18.3 yast2 >= 2.19.4 yast2-libyui >= 2.18.7 Requires: rubygem-ruby-dbus -Requires: yast2 >= 2.19.4 -Requires: yast2-core >= 2.18.3 -Requires: yast2-libyui >= 2.18.7 %ifarch s390 s390x Requires: yast2-s390 %endif PreReq: %fillup_prereq -Provides: y2a_fdsk -Provides: yast2-config-disk -Obsoletes: y2a_fdsk -Obsoletes: yast2-config-disk -Provides: yast2-agent-fdisk -Provides: yast2-agent-fdisk-devel -Obsoletes: yast2-agent-fdisk -Obsoletes: yast2-agent-fdisk-devel +Provides: y2a_fdsk yast2-config-disk +Obsoletes: y2a_fdsk yast2-config-disk +Provides: yast2-agent-fdisk yast2-agent-fdisk-devel +Obsoletes: yast2-agent-fdisk yast2-agent-fdisk-devel Provides: yast2-trans-inst-partitioning Obsoletes: yast2-trans-inst-partitioning Provides: y2t_inst-partitioning @@ -63,8 +55,6 @@ Requires: yast2-ruby-bindings >= 1.0.0 Summary: YaST2 - Storage Configuration -License: GPL-2.0 -Group: System/YaST %description This package contains the files for YaST2 that handle access to disk @@ -82,6 +72,7 @@ rm -f $RPM_BUILD_ROOT/%{yast_plugindir}/libpy2StorageCallbacks.la rm -f $RPM_BUILD_ROOT/%{yast_plugindir}/libpy2StorageCallbacks.so + %post %{fillup_only -an storage} @@ -129,9 +120,8 @@ %{yast_ybindir}/check.boot %package devel -Requires: libstdc++-devel -Requires: yast2-storage = %version Requires: libstorage-devel = %(echo `rpm -q --queryformat '%{VERSION}' libstorage-devel`) +Requires: libstdc++-devel yast2-storage = %version Summary: YaST2 - Storage Library Headers and Documentation Group: Development/Libraries/YaST @@ -144,5 +134,3 @@ %defattr(-,root,root) %doc %{yast_docdir}/autodocs %doc %{yast_docdir}/config.xml.description - -%changelog ++++++ yast2-storage-3.1.5.tar.bz2 -> yast2-storage-3.1.6.tar.bz2 ++++++ ++++ 2984 lines of diff (skipped) continue with "q"... Checked in at Mon Jan 27 16:09:55 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org To contact the owner, e-mail: yast-devel+owner(a)opensuse.org

1 0

[yast-devel] [ci_new_pac] JFYI yast2-packager -> sle12
by ro 27 Jan '14

27 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/yast2-packager -> sle12 ## BNC# 857681 : "Duplicit Information: Installation Media, Update Options - No additional value provided" (ASSIGNED/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-packager/yast2-packager.changes 2014-01-17 14:16:31.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-packager/yast2-packager.changes 2014-01-24 17:25:04.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 7 17:59:13 CET 2014 - locilka(a)suse.com + +- Removed unneeded client inst_media (bnc#857681) +- 3.1.1 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-packager - at least 26 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-packager (Old) and /mounts/work_src_done/SLE12/yast2-packager (BS:build ID:31200 MAIL:yast-devel@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-packager", Maintainer is "yast-devel(a)opensuse.org" Old: ---- yast2-packager-3.1.0.tar.bz2 New: ---- yast2-packager-3.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.HMgrlt/_old 2014-01-27 16:09:03.000000000 +0100 +++ /var/tmp/diff_new_pack.HMgrlt/_new 2014-01-27 16:09:03.000000000 +0100 @@ -17,17 +17,16 @@ Name: yast2-packager -Version: 3.1.0 +Version: 3.1.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -BuildRequires: update-desktop-files -BuildRequires: yast2-country-data -BuildRequires: yast2-devtools >= 3.0.6 -BuildRequires: yast2-testsuite -BuildRequires: yast2-xml +Group: System/YaST +License: GPL-2.0+ +BuildRequires: yast2-country-data yast2-xml update-desktop-files yast2-testsuite +BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2 >= 3.0.5 @@ -72,30 +71,21 @@ Provides: yast2-config-package-manager Obsoletes: yast2-config-package-manager -Provides: y2c_spkg -Provides: y2pkginf -Provides: y2t_inst-packages -Provides: y2t_spkg -Obsoletes: y2c_spkg -Obsoletes: y2pkginf -Obsoletes: y2t_inst-packages -Obsoletes: y2t_spkg -Provides: yast2-trans-inst-packages -Provides: yast2-trans-package-manager -Obsoletes: yast2-trans-inst-packages -Obsoletes: yast2-trans-package-manager +Provides: y2t_spkg y2t_inst-packages y2pkginf y2c_spkg +Obsoletes: y2t_spkg y2t_inst-packages y2pkginf y2c_spkg +Provides: yast2-trans-package-manager yast2-trans-inst-packages +Obsoletes: yast2-trans-package-manager yast2-trans-inst-packages # force *-webpin subpackage removal at upgrade Obsoletes: yast2-packager-webpin < %version Requires: yast2-ruby-bindings >= 1.0.0 Summary: YaST2 - Package Library -License: GPL-2.0+ -Group: System/YaST + %package devel-doc Requires: yast2-packager = %version -Summary: YaST2 - Development Documentation Group: System/YaST +Summary: YaST2 - Development Documentation %description This package contains the libraries and modules for software management. @@ -113,6 +103,7 @@ %install %yast_install + %files %defattr(-,root,root) %dir %{yast_yncludedir}/checkmedia @@ -130,4 +121,4 @@ %files devel-doc %doc %{yast_docdir}/autodocs -%changelog + ++++++ yast2-packager-3.1.0.tar.bz2 -> yast2-packager-3.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.0/VERSION new/yast2-packager-3.1.1/VERSION --- old/yast2-packager-3.1.0/VERSION 2013-11-08 12:49:48.000000000 +0100 +++ new/yast2-packager-3.1.1/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.0/package/yast2-packager.changes new/yast2-packager-3.1.1/package/yast2-packager.changes --- old/yast2-packager-3.1.0/package/yast2-packager.changes 2013-11-08 12:49:48.000000000 +0100 +++ new/yast2-packager-3.1.1/package/yast2-packager.changes 2014-01-27 11:58:31.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 7 17:59:13 CET 2014 - locilka(a)suse.com + +- Removed unneeded client inst_media (bnc#857681) +- 3.1.1 + +------------------------------------------------------------------- Wed Nov 6 13:41:42 UTC 2013 - lslezak(a)suse.cz - reinitialize the target to sync the libzypp repomanager diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.0/package/yast2-packager.spec new/yast2-packager-3.1.1/package/yast2-packager.spec --- old/yast2-packager-3.1.0/package/yast2-packager.spec 2013-11-08 12:49:48.000000000 +0100 +++ new/yast2-packager-3.1.1/package/yast2-packager.spec 2014-01-27 11:58:31.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.0 +Version: 3.1.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -26,7 +26,7 @@ Group: System/YaST License: GPL-2.0+ BuildRequires: yast2-country-data yast2-xml update-desktop-files yast2-testsuite -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2 >= 3.0.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.0/src/Makefile.am new/yast2-packager-3.1.1/src/Makefile.am --- old/yast2-packager-3.1.0/src/Makefile.am 2013-11-08 12:49:48.000000000 +0100 +++ new/yast2-packager-3.1.1/src/Makefile.am 2014-01-27 11:58:31.000000000 +0100 @@ -33,7 +33,6 @@ clients/inst_rpmcopy.rb \ clients/inst_custom_packages.rb \ clients/inst_productsources.rb \ - clients/inst_media.rb \ clients/software_proposal.rb \ clients/pkg_finish.rb \ clients/inst_sw_select.rb \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.0/src/clients/inst_media.rb new/yast2-packager-3.1.1/src/clients/inst_media.rb --- old/yast2-packager-3.1.0/src/clients/inst_media.rb 2013-11-08 12:49:48.000000000 +0100 +++ new/yast2-packager-3.1.1/src/clients/inst_media.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,94 +0,0 @@ -# encoding: utf-8 - -# Module: inst_media.ycp -# -# Authors: Arvin Schnell <arvin(a)suse.de> -# -# Purpose: Show some stuff about the installation media. -# -# $Id$ -# -module Yast - class InstMediaClient < Client - def main - Yast.import "Pkg" - textdomain "packager" - - Yast.import "Label" - Yast.import "Popup" - Yast.import "Wizard" - Yast.import "Packages" - Yast.import "String" - - - @source_list = [] - - @num = Builtins.size(Packages.theSources) - if Ops.less_or_equal(@num, 0) - Builtins.y2error("Invalid repository") - else - Builtins.foreach(Packages.theSources) do |i| - new_product = Pkg.SourceProductData(i) - @source_list = Builtins.add( - @source_list, - Item(Id(i), Ops.get_locale(new_product, "label", _("Unknown"))) - ) - end - end - - - # screen title - @title = _("Installation Media") - - # label for showing repositories - @label = _("Registered Repositories") - - # help text for dialog to show repositories - @help_text = _("All registered repositories are shown here.\n\n") - - @contents = VBox( - HCenter( - HSquash( - VBox( - HSpacing(40), # force minimum width - Left(Label(@label)), - Table( - Id(:sources), - # table header - Header(_("Name")), - @source_list - ) - ) - ) - ), - VSpacing(2) - ) - - - Wizard.OpenAcceptDialog - Wizard.SetContents( - @title, - @contents, - @help_text, - Convert.to_boolean(WFM.Args(0)), - Convert.to_boolean(WFM.Args(1)) - ) - - @ret = nil - - while true - @ret = Wizard.UserInput - - break if @ret == :abort && Popup.ConfirmAbort(:painless) - - break if @ret == :cancel || @ret == :back || @ret == :next - end - - Wizard.CloseDialog - - deep_copy(@ret) - end - end -end - -Yast::InstMediaClient.new.main continue with "q"... Checked in at Mon Jan 27 16:09:13 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org To contact the owner, e-mail: yast-devel+owner(a)opensuse.org

1 0

[yast-devel] [ci_new_pac] JFYI yast2-online-update-configuration -> sle12
by ro 27 Jan '14

27 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/yast2-online-update-configuration -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-online-update-configuration/yast2-online-update-configuration.changes 2014-01-17 14:16:31.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-online-update-configuration/yast2-online-update-configuration.changes 2014-01-20 09:43:32.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Dec 18 09:00:16 UTC 2013 - vmoravec(a)suse.com + +- Fix missing lib dir in makefile and specfile +- 3.1.3 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-online-update-configuration - yast2-schema ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-online-update-configuration (Old) and /mounts/work_src_done/SLE12/yast2-online-update-configuration (BS:build ID:31196 MAIL:yast-devel@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-online-update-configuration", Maintainer is "yast-devel(a)opensuse.org" Old: ---- yast2-online-update-configuration-3.1.2.tar.bz2 New: ---- yast2-online-update-configuration-3.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-online-update-configuration.spec ++++++ --- /var/tmp/diff_new_pack.1xFne5/_old 2014-01-27 16:08:30.000000000 +0100 +++ /var/tmp/diff_new_pack.1xFne5/_new 2014-01-27 16:08:30.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-online-update-configuration # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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,12 +17,14 @@ Name: yast2-online-update-configuration -Version: 3.1.2 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 +Group: System/YaST +License: GPL-2.0 # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.0 Requires: yast2-packager >= 2.17.0 @@ -31,20 +33,15 @@ Provides: yast2-registration:/usr/share/YaST2/clients/online_update_configuration.ycp PreReq: %fillup_prereq -BuildRequires: perl-XML-Writer -BuildRequires: update-desktop-files BuildRequires: yast2 >= 2.17.0 -BuildRequires: yast2-devtools >= 3.1.10 -BuildRequires: yast2-packager +BuildRequires: perl-XML-Writer update-desktop-files yast2-packager yast2-testsuite +BuildRequires: yast2-devtools >= 3.1.15 BuildRequires: yast2-pkg-bindings >= 2.17.20 -BuildRequires: yast2-testsuite BuildArch: noarch Requires: yast2-ruby-bindings >= 1.0.0 Summary: Configuration of Online Update -License: GPL-2.0 -Group: System/YaST %description Allows to configure automatic online update. @@ -61,6 +58,7 @@ %install %yast_install + %files %defattr(-,root,root) %doc %{yast_docdir} @@ -68,6 +66,8 @@ %{yast_yncludedir}/online-update-configuration/* %{yast_clientdir}/*.rb %{yast_moduledir}/*.rb +%dir %{yast_libdir}/online-update-configuration +%{yast_libdir}/online-update-configuration %{yast_desktopdir}/online_update_configuration.desktop %{yast_schemadir}/autoyast/rnc/*.rnc /usr/lib/YaST2/bin/online_update @@ -75,5 +75,3 @@ %{yast_scrconfdir}/cfg_automatic_online_update.scr # fillup /var/adm/fillup-templates/sysconfig.automatic_online_update-yast2-online-update-configuration - -%changelog ++++++ yast2-online-update-configuration-3.1.2.tar.bz2 -> yast2-online-update-configuration-3.1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-online-update-configuration-3.1.2/package/yast2-online-update-configuration.changes new/yast2-online-update-configuration-3.1.3/package/yast2-online-update-configuration.changes --- old/yast2-online-update-configuration-3.1.2/package/yast2-online-update-configuration.changes 2013-12-17 14:34:08.000000000 +0100 +++ new/yast2-online-update-configuration-3.1.3/package/yast2-online-update-configuration.changes 2014-01-27 11:51:59.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 18 09:00:16 UTC 2013 - vmoravec(a)suse.com + +- Fix missing lib dir in makefile and specfile +- 3.1.3 + +------------------------------------------------------------------- Tue Dec 17 13:20:40 UTC 2013 - vmoravec(a)suse.com - Add option for using deltarpms during update - FATE#314867 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-online-update-configuration-3.1.2/package/yast2-online-update-configuration.spec new/yast2-online-update-configuration-3.1.3/package/yast2-online-update-configuration.spec --- old/yast2-online-update-configuration-3.1.2/package/yast2-online-update-configuration.spec 2013-12-17 14:34:08.000000000 +0100 +++ new/yast2-online-update-configuration-3.1.3/package/yast2-online-update-configuration.spec 2014-01-27 11:51:59.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-online-update-configuration -Version: 3.1.2 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,7 +35,7 @@ PreReq: %fillup_prereq BuildRequires: yast2 >= 2.17.0 BuildRequires: perl-XML-Writer update-desktop-files yast2-packager yast2-testsuite -BuildRequires: yast2-devtools >= 3.1.10 +BuildRequires: yast2-devtools >= 3.1.15 BuildRequires: yast2-pkg-bindings >= 2.17.20 BuildArch: noarch @@ -66,6 +66,8 @@ %{yast_yncludedir}/online-update-configuration/* %{yast_clientdir}/*.rb %{yast_moduledir}/*.rb +%dir %{yast_libdir}/online-update-configuration +%{yast_libdir}/online-update-configuration %{yast_desktopdir}/online_update_configuration.desktop %{yast_schemadir}/autoyast/rnc/*.rnc /usr/lib/YaST2/bin/online_update diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-online-update-configuration-3.1.2/src/Makefile.am new/yast2-online-update-configuration-3.1.3/src/Makefile.am --- old/yast2-online-update-configuration-3.1.2/src/Makefile.am 2013-12-17 14:34:08.000000000 +0100 +++ new/yast2-online-update-configuration-3.1.3/src/Makefile.am 2014-01-27 11:51:59.000000000 +0100 @@ -7,6 +7,10 @@ clients/online_update_configuration_auto.rb \ clients/online_update_configuration.rb +ylibdir = @ylibdir@/online-update-configuration +ylib_DATA = \ + lib/online-update-configuration/zypp_config.rb + yncludedir = @yncludedir@/online-update-configuration ynclude_DATA = \ include/online-update-configuration/OUCDialogs.rb @@ -24,6 +28,6 @@ fillup_DATA = \ fillup/sysconfig.automatic_online_update-yast2-online-update-configuration -EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(schemafiles_DATA) $(ybin_SCRIPTS) $(desktop_DATA) $(fillup_DATA) +EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(schemafiles_DATA) $(ybin_SCRIPTS) $(desktop_DATA) $(fillup_DATA) $(ylib_DATA) -include $(top_srcdir)/Makefile.am.common \ No newline at end of file +include $(top_srcdir)/Makefile.am.common continue with "q"... Checked in at Mon Jan 27 16:08:51 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org To contact the owner, e-mail: yast-devel+owner(a)opensuse.org

1 0

[yast-devel] [ci_new_pac] JFYI yast2-kdump -> sle12
by ro 27 Jan '14

27 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/yast2-kdump -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-kdump/yast2-kdump.changes 2014-01-17 14:16:30.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-kdump/yast2-kdump.changes 2014-01-24 10:20:35.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 23 09:27:46 UTC 2014 - mvidner(a)suse.com + +- run a tool to propose the crashkernel value (FATE#315241) +- 3.1.3 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - installation-images - installation-images-extras - yast2-kdump - yast2-schema ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-kdump (Old) and /mounts/work_src_done/SLE12/yast2-kdump (BS:build ID:31199 MAIL:yast-devel@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-kdump", Maintainer is "yast-devel(a)opensuse.org" Old: ---- yast2-kdump-3.1.2.tar.bz2 New: ---- yast2-kdump-3.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-kdump.spec ++++++ --- /var/tmp/diff_new_pack.5qSuDO/_old 2014-01-27 16:08:11.000000000 +0100 +++ /var/tmp/diff_new_pack.5qSuDO/_new 2014-01-27 16:08:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-kdump # -# 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,23 +17,19 @@ Name: yast2-kdump -Version: 3.1.2 +Version: 3.1.3 Release: 0 +Url: https://github.com/yast/yast-kdump BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -Requires: yast2 -Requires: yast2-bootloader -Requires: yast2-storage -BuildRequires: perl-XML-Writer -BuildRequires: rubygem-rspec -BuildRequires: update-desktop-files -BuildRequires: yast2 -BuildRequires: yast2-bootloader +Group: System/YaST +License: GPL-2.0 +Requires: yast2 yast2-storage yast2-bootloader +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-testsuite yast2-storage yast2-bootloader BuildRequires: yast2-devtools >= 3.1.10 -BuildRequires: yast2-storage -BuildRequires: yast2-testsuite +BuildRequires: rubygem-rspec Recommends: kdump makedumpfile @@ -44,8 +40,6 @@ Requires: yast2-ruby-bindings >= 1.0.0 Summary: Configuration of kdump -License: GPL-2.0 -Group: System/YaST %description Configuration of kdump @@ -59,6 +53,7 @@ %install %yast_install + %files %defattr(-,root,root) %dir %{yast_yncludedir}/kdump @@ -70,5 +65,3 @@ %{yast_schemadir}/autoyast/rnc/kdump.rnc %{yast_scrconfdir}/*.scr %doc %{yast_docdir} - -%changelog ++++++ yast2-kdump-3.1.2.tar.bz2 -> yast2-kdump-3.1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.1.2/package/yast2-kdump.changes new/yast2-kdump-3.1.3/package/yast2-kdump.changes --- old/yast2-kdump-3.1.2/package/yast2-kdump.changes 2014-01-13 10:19:44.000000000 +0100 +++ new/yast2-kdump-3.1.3/package/yast2-kdump.changes 2014-01-27 11:57:18.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 23 09:27:46 UTC 2014 - mvidner(a)suse.com + +- run a tool to propose the crashkernel value (FATE#315241) +- 3.1.3 + +------------------------------------------------------------------- Fri Jan 10 16:25:05 CET 2014 - locilka(a)suse.com - Added command-line support for firmware-assisted dump diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.1.2/package/yast2-kdump.spec new/yast2-kdump-3.1.3/package/yast2-kdump.spec --- old/yast2-kdump-3.1.2/package/yast2-kdump.spec 2014-01-13 10:19:44.000000000 +0100 +++ new/yast2-kdump-3.1.3/package/yast2-kdump.spec 2014-01-27 11:57:18.000000000 +0100 @@ -17,9 +17,10 @@ Name: yast2-kdump -Version: 3.1.2 +Version: 3.1.3 Release: 0 +Url: https://github.com/yast/yast-kdump BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.1.2/src/clients/kdump.rb new/yast2-kdump-3.1.3/src/clients/kdump.rb --- old/yast2-kdump-3.1.2/src/clients/kdump.rb 2014-01-13 10:19:44.000000000 +0100 +++ new/yast2-kdump-3.1.3/src/clients/kdump.rb 2014-01-27 11:57:18.000000000 +0100 @@ -420,7 +420,7 @@ CommandLine.Print( Builtins.sformat( _("Allocate memory (MB) for kdump is: %1"), - Kdump.alocated_memory + Kdump.allocated_memory ) ) else @@ -737,7 +737,7 @@ if Ops.get(options, "enable") != nil && Ops.get(options, "alloc_mem") != nil Kdump.add_crashkernel_param = true - Kdump.alocated_memory = Builtins.tostring(Ops.get(options, "alloc_mem")) + Kdump.allocated_memory = Builtins.tostring(Ops.get(options, "alloc_mem")) #TRANSLATORS: CommandLine printed text if Kdump.crashkernel_list_ranges CommandLine.Print( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.1.2/src/include/kdump/dialogs.rb new/yast2-kdump-3.1.3/src/include/kdump/dialogs.rb --- old/yast2-kdump-3.1.2/src/include/kdump/dialogs.rb 2014-01-13 10:19:44.000000000 +0100 +++ new/yast2-kdump-3.1.3/src/include/kdump/dialogs.rb 2014-01-27 11:57:18.000000000 +0100 @@ -90,7 +90,7 @@ ), Left( IntField( - Id("memory_buffer"), + Id("allocated_memory"), Opt(:notify), _("Kdump Memor&y [MB]"), 32, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.1.2/src/include/kdump/uifunctions.rb new/yast2-kdump-3.1.3/src/include/kdump/uifunctions.rb --- old/yast2-kdump-3.1.2/src/include/kdump/uifunctions.rb 2014-01-13 10:19:44.000000000 +0100 +++ new/yast2-kdump-3.1.3/src/include/kdump/uifunctions.rb 2014-01-27 11:57:18.000000000 +0100 @@ -1382,9 +1382,9 @@ Builtins.tostring(Kdump.total_memory) ) UI.ChangeWidget( - Id("memory_buffer"), + Id("allocated_memory"), :Value, - Builtins.tointeger(Kdump.alocated_memory) + Builtins.tointeger(Kdump.allocated_memory) ) UI.ChangeWidget( Id("usable_memory"), @@ -1392,14 +1392,14 @@ Builtins.tostring( Ops.subtract( Kdump.total_memory, - Convert.to_integer(UI.QueryWidget(Id("memory_buffer"), :Value)) + Convert.to_integer(UI.QueryWidget(Id("allocated_memory"), :Value)) ) ) ) else UI.ChangeWidget(Id("total_memory"), :Value, "0") UI.ChangeWidget(Id("usable_memory"), :Value, "0") - UI.ChangeWidget(Id("memory_buffer"), :Enabled, false) + UI.ChangeWidget(Id("allocated_memory"), :Enabled, false) end nil @@ -1411,10 +1411,10 @@ def HandleKdumpMemory(key, event) event = deep_copy(event) ret = Ops.get(event, "ID") - if ret == "memory_buffer" - value = Convert.to_integer(UI.QueryWidget(Id("memory_buffer"), :Value)) + if ret == "allocated_memory" + value = Convert.to_integer(UI.QueryWidget(Id("allocated_memory"), :Value)) if Ops.greater_than(value, Kdump.total_memory) - UI.ChangeWidget(Id("memory_buffer"), :Value, Kdump.total_memory) + UI.ChangeWidget(Id("allocated_memory"), :Value, Kdump.total_memory) UI.ChangeWidget(Id("usable_memory"), :Value, "0") else UI.ChangeWidget( @@ -1423,7 +1423,7 @@ Builtins.tostring( Ops.subtract( Kdump.total_memory, - Convert.to_integer(UI.QueryWidget(Id("memory_buffer"), :Value)) + Convert.to_integer(UI.QueryWidget(Id("allocated_memory"), :Value)) ) ) ) @@ -1454,8 +1454,8 @@ def StoreKdumpMemory(key, event) event = deep_copy(event) - Kdump.alocated_memory = Builtins.tostring( - UI.QueryWidget(Id("memory_buffer"), :Value) + Kdump.allocated_memory = Builtins.tostring( + UI.QueryWidget(Id("allocated_memory"), :Value) ) nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.1.2/src/modules/Kdump.rb new/yast2-kdump-3.1.3/src/modules/Kdump.rb --- old/yast2-kdump-3.1.2/src/modules/Kdump.rb 2014-01-13 10:19:44.000000000 +0100 +++ new/yast2-kdump-3.1.3/src/modules/Kdump.rb 2014-01-27 11:57:18.000000000 +0100 @@ -138,7 +138,7 @@ # "crashkernel" # # string value number of alocate memory - @alocated_memory = "0" + @allocated_memory = "0" # Boolean option indicates that Import() # was called and data was proposed @@ -465,12 +465,12 @@ end - # get alocated memory from value of crashkernel option + # get allocated memory from value of crashkernel option # there can be several ranges -> take the first range # @param string 64M@16M or 128M-:64M@16M [(reserved_memory*2)-:reserved_memory] - # @return [String] value of alocated memory (64M) + # @return [String] value of allocated memory (64M) - def getAlocatedMemory(crash_value) + def getAllocatedMemory(crash_value) result = "" allocated = "" range = "" @@ -496,7 +496,7 @@ result end - # Build crashkernel value from alocated memory + # Build crashkernel value from allocated memory # # @return [String] value of crashkernel @@ -506,7 +506,7 @@ return @crashkernel_param_value if @crashkernel_list_ranges crash_value = "" - crash_value = Ops.add(@alocated_memory, "M") + crash_value = Ops.add(@allocated_memory, "M") # bnc#563905 problem with offset in crashkernel if Arch.i386 || Arch.x86_64 || Arch.ia64 || Arch.ppc64 @@ -523,7 +523,7 @@ end reserved_memory = Builtins.tostring( - Ops.multiply(2, Builtins.tointeger(@alocated_memory)) + Ops.multiply(2, Builtins.tointeger(@allocated_memory)) ) @@ -542,7 +542,7 @@ def convertCrashkernelForXEN(crash) crash_value = "" if crash != "" - crash_value = Ops.add(getAlocatedMemory(crash), "M") + crash_value = Ops.add(getAllocatedMemory(crash), "M") # bnc#563905 problem with offset in crashkernel #if ((Arch::i386()) ||(Arch::x86_64()) || Arch::ppc64()) # crash_value = crash_value + "@16M"; @@ -621,7 +621,7 @@ @crashkernel_param = true @add_crashkernel_param = true @crashkernel_param_value = getCrashKernelValue(crash_arg) - @alocated_memory = getAlocatedMemory(@crashkernel_param_value) + @allocated_memory = getAllocatedMemory(@crashkernel_param_value) else @crashkernel_param = false @add_crashkernel_param = false @@ -662,61 +662,45 @@ @crashkernel_param_value = result if result != "false" - @alocated_memory = getAlocatedMemory(@crashkernel_param_value) + @allocated_memory = getAllocatedMemory(@crashkernel_param_value) end true end - # Propose reserved/allocated memory - # - # - # @return [Boolean] successfull + TEMPORARY_CONFIG_FILE = "/var/lib/YaST2/kdump.sysconfig" - def ProposeAlocatedMemory - if @alocated_memory == "0" - if Ops.greater_or_equal(@total_memory, 512) && - Ops.less_than(Ops.divide(@total_memory, 1024), 2) - @alocated_memory = "64" - elsif Ops.greater_or_equal(Ops.divide(@total_memory, 1024), 2) - @alocated_memory = "128" - end + def write_temporary_config_file + # FIXME parameterize Write instead of copying the old config + # NOTE make sure we do not lose 600 mode (cp is ok) + command = "cp #{@kdump_file} #{TEMPORARY_CONFIG_FILE}" + retcode = SCR.Execute(path(".target.bash"), command) + # if this fails the system is broken; SCR has logged the details + raise "cannot copy files" if retcode != 0 + end - # bnc #431492 - UPT-LTE: /proc/vmcore is empty in kdump kerne - if Arch.ppc64 && @alocated_memory != "" - al_mem = Builtins.tointeger(@alocated_memory) - al_mem = Ops.multiply(al_mem, 2) - @alocated_memory = Builtins.tostring(al_mem) - end - # bnc #446480 - Fine-tune kdump memory proposal - if Arch.ia64 && Ops.greater_or_equal(@total_memory, 1024) - total_memory_gigabyte = Ops.divide(@total_memory, 1024) - if Ops.greater_or_equal(total_memory_gigabyte, 1) && - Ops.less_than(total_memory_gigabyte, 8) - @alocated_memory = "256" - elsif Ops.greater_or_equal(total_memory_gigabyte, 8) && - Ops.less_than(total_memory_gigabyte, 128) - @alocated_memory = "512" - elsif Ops.greater_or_equal(total_memory_gigabyte, 128) && - Ops.less_than(total_memory_gigabyte, 256) - @alocated_memory = "768" - elsif Ops.greater_or_equal(total_memory_gigabyte, 256) && - Ops.less_than(total_memory_gigabyte, 378) - @alocated_memory = "1024" - elsif Ops.greater_or_equal(total_memory_gigabyte, 378) && - Ops.less_than(total_memory_gigabyte, 512) - @alocated_memory = "1536" - elsif Ops.greater_or_equal(total_memory_gigabyte, 512) && - Ops.less_than(total_memory_gigabyte, 768) - @alocated_memory = "2048" - elsif Ops.greater_or_equal(total_memory_gigabyte, 768) - @alocated_memory = "3072" - end - end + PROPOSE_ALLOCATED_MEMORY_MB_COMMAND = "kdumptool --configfile #{TEMPORARY_CONFIG_FILE} calibrate" + # if the command fails + PROPOSE_ALLOCATED_MEMORY_MB_FALLBACK = "128" + + # Propose reserved/allocated memory + # Store the result as a string! to @allocated_memory + # @return [Boolean] true, always successful + def ProposeAllocatedMemory + # only propose once + return true if @allocated_memory != "0" + + write_temporary_config_file + out = SCR.Execute(path(".target.bash_output"), PROPOSE_ALLOCATED_MEMORY_MB_COMMAND) + @allocated_memory = out["stdout"].chomp + if out["exit"] != 0 or @allocated_memory.empty? + # stderr has been already logged + Builtins.y2error("failed to propose allocated memory") + @allocated_memory = PROPOSE_ALLOCATED_MEMORY_MB_FALLBACK end Builtins.y2milestone( "[kdump] allocated memory if not set in \"crashkernel\" param: %1", - @alocated_memory + @allocated_memory ) true end @@ -756,7 +740,7 @@ "[kdump] (ReadAvailableMemory) total phys. memory [MB]: %1", Builtins.tostring(@total_memory) ) - ProposeAlocatedMemory() + ProposeAllocatedMemory() true end @@ -1356,7 +1340,7 @@ publish :variable => :crashkernel_param, :type => "boolean" publish :variable => :crashkernel_param_value, :type => "string" publish :variable => :add_crashkernel_param, :type => "boolean" - publish :variable => :alocated_memory, :type => "string" + publish :variable => :allocated_memory, :type => "string" publish :variable => :import_called, :type => "boolean" publish :variable => :actual_boot_section, :type => "string" publish :variable => :write_only, :type => "boolean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.1.2/test/Makefile.am new/yast2-kdump-3.1.3/test/Makefile.am --- old/yast2-kdump-3.1.2/test/Makefile.am 2014-01-13 10:19:44.000000000 +0100 +++ new/yast2-kdump-3.1.3/test/Makefile.am 2014-01-27 11:57:18.000000000 +0100 @@ -1,5 +1,6 @@ TESTS = \ - fadump_test.rb + fadump_test.rb \ + kdump_test.rb TEST_EXTENSIONS = .rb RB_LOG_COMPILER = rspec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.1.2/test/kdump_test.rb new/yast2-kdump-3.1.3/test/kdump_test.rb --- old/yast2-kdump-3.1.2/test/kdump_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-kdump-3.1.3/test/kdump_test.rb 2014-01-27 11:57:18.000000000 +0100 @@ -0,0 +1,43 @@ +#!/usr/bin/env rspec +ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) + +require "yast" +include Yast +Yast.import "Kdump" + +describe Kdump do + # allocated_memory is a string in megabytes + # total_memory is an integer in megabytes + describe "#ProposeAllocatedMemory" do + context "when already proposed" do + before(:each) do + Kdump.allocated_memory = "42" + end + it "proposes the current value" do + Kdump.ProposeAllocatedMemory + expect(Kdump.allocated_memory).to eq "42" + end + end + + context "when not yet proposed" do + before(:each) do + Kdump.allocated_memory = "0" + end + + context "when the proposal tool is not implemented yet" do + before(:each) do + SCR.stub(:Execute). + with(path(".target.bash"), /^cp/).and_return(0) + SCR.stub(:Execute). + with(path(".target.bash_output"), /^kdumptool/). + and_return({"exit" => 1, "stdout" => "", "stderr" => "not there" }) + end + + it "proposes a positive integer" do + Kdump.ProposeAllocatedMemory + expect(Kdump.allocated_memory.to_i).to be > 0 + end + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.1.2/testsuite/Makefile.am new/yast2-kdump-3.1.3/testsuite/Makefile.am --- old/yast2-kdump-3.1.2/testsuite/Makefile.am 2014-01-13 10:19:44.000000000 +0100 +++ new/yast2-kdump-3.1.3/testsuite/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -# -# Makefile.am for .../testsuite -# -# Do not edit this file (Makefile.am) as it will be overwritten! -# - -AUTOMAKE_OPTIONS = dejagnu -EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.rb) - -testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite - -all-local: $(testsuite_prepare) - make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) - -clean-local: $(testsuite_prepare) - make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean - -check-local: $(testsuite_prepare) - make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check - -# EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.1.2/testsuite/tests/Kdump.rb new/yast2-kdump-3.1.3/testsuite/tests/Kdump.rb --- old/yast2-kdump-3.1.2/testsuite/tests/Kdump.rb 2014-01-13 10:19:44.000000000 +0100 +++ new/yast2-kdump-3.1.3/testsuite/tests/Kdump.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -# encoding: utf-8 - -module Yast - class KdumpClient < Client - def main - # testedfiles: Kdump.ycp - - Yast.include self, "testsuite.rb" - # map I_READ = $[]; - # map I_WRITE = $[]; - # map I_EXEC = $[ - # "target" : $[ - # "bash_output" : $[], - # ], - # ]; - # - # TESTSUITE_INIT([I_EXEC, I_READ, I_WRITE], nil); - # - # - # import "Kdump"; - # - # - # DUMP("Kdump::Modified"); - # TEST(``(Kdump::Modified()), [], nil); - - nil - end - end -end - -Yast::KdumpClient.new.main continue with "q"... Checked in at Mon Jan 27 16:08:25 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org To contact the owner, e-mail: yast-devel+owner(a)opensuse.org

1 0

[yast-devel] [ci_new_pac] JFYI yast2-country -> sle12
by ro 27 Jan '14

27 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/yast2-country -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-country/yast2-country.changes 2014-01-17 14:16:27.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-country/yast2-country.changes 2014-01-22 09:51:27.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 21 09:16:47 UTC 2014 - jsrain(a)suse.cz + +- adjusted timezone dialog layout (fate#314695) +- 3.1.1 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-country - at least 28 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-country (Old) and /mounts/work_src_done/SLE12/yast2-country (BS:build ID:31194 MAIL:yast-devel@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-country", Maintainer is "yast-devel(a)opensuse.org" Old: ---- yast2-country-3.1.0.tar.bz2 New: ---- yast2-country-3.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.vY4lKB/_old 2014-01-27 16:07:52.000000000 +0100 +++ /var/tmp/diff_new_pack.vY4lKB/_new 2014-01-27 16:07:52.000000000 +0100 @@ -17,25 +17,21 @@ Name: yast2-country -Version: 3.1.0 +Version: 3.1.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 +Group: System/YaST +License: GPL-2.0 #policy files for YaPI dbus interface Source1: org.opensuse.yast.modules.yapi.time.policy Source2: org.opensuse.yast.modules.yapi.language.policy -BuildRequires: perl-XML-Writer +BuildRequires: perl-XML-Writer update-desktop-files yast2-testsuite yast2 yast2-perl-bindings +BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: polkit-devel -BuildRequires: update-desktop-files -BuildRequires: yast2 -BuildRequires: yast2-devtools >= 3.0.6 -BuildRequires: yast2-perl-bindings -BuildRequires: yast2-testsuite -Requires: timezone -Requires: yast2-perl-bindings -Requires: yast2-trans-stats +Requires: yast2-trans-stats yast2-perl-bindings timezone # XVersion.ycp # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 @@ -58,12 +54,8 @@ Obsoletes: yast2-config-keyboard Obsoletes: yast2-config-language Obsoletes: yast2-config-timezone -Provides: yast2-db-country -Provides: yast2-db-keyboard -Provides: yast2-db-timezone -Obsoletes: yast2-db-country -Obsoletes: yast2-db-keyboard -Obsoletes: yast2-db-timezone +Provides: yast2-db-country yast2-db-keyboard yast2-db-timezone +Obsoletes: yast2-db-country yast2-db-keyboard yast2-db-timezone Provides: yast2-trans-inst-keyboard Obsoletes: yast2-trans-inst-keyboard Provides: yast2-trans-inst-language @@ -84,8 +76,6 @@ Requires: yast2-ruby-bindings >= 1.0.0 Summary: YaST2 - Country Settings (Language, Keyboard, and Timezone) -License: GPL-2.0 -Group: System/YaST %description Country specific data and configuration modules (language, keyboard, @@ -105,6 +95,7 @@ install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/polkit-1/actions/ install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/polkit-1/actions/ + # common %files %defattr(-,root,root) @@ -145,4 +136,3 @@ %{yast_ydatadir}/languages/*.ycp %{yast_moduledir}/Language.rb -%changelog ++++++ yast2-country-3.1.0.tar.bz2 -> yast2-country-3.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.0/CONTRIBUTING.md new/yast2-country-3.1.1/CONTRIBUTING.md --- old/yast2-country-3.1.0/CONTRIBUTING.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-country-3.1.1/CONTRIBUTING.md 2014-01-27 11:48:03.000000000 +0100 @@ -0,0 +1,87 @@ +YaST Contribution Guidelines +============================ + +YaST is an open source project and as such it welcomes all kinds of +contributions. If you decide to contribute, please follow these guidelines to +ensure the process is effective and pleasant both for you and YaST maintainers. + +There are two main forms of contribution: reporting bugs and performing code +changes. + +Bug Reports +----------- + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) +or [GitHub issues](../../issues). (For Bugzilla, use the [simplified +registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) +if you don't have an account yet.) + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee +that every bug will be fixed, but we'll try. + +When creating a bug report, please follow our [bug reporting +guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). + +Code Changes +------------ + +We welcome all kinds of code contributions, from simple bug fixes to significant +refactorings and implementation of new features. However, before making any +non-trivial contribution, get in touch with us first — this can prevent wasted +effort on both sides. Also, have a look at our [development +documentation](http://en.opensuse.org/openSUSE:YaST_development). + +To send us your code change, use GitHub pull requests. The workflow is as +follows: + + 1. Fork the project. + + 2. Create a topic branch based on `master`. + + 3. Implement your change, including tests (if possible). Make sure you adhere + to the [Ruby style + guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). + + 4. Make sure your change didn't break anything by building the RPM package + (`rake osc:build`). The build process includes running the full testsuite. + + 5. Publish the branch and create a pull request. + + 6. YaST developers will review your change and possibly point out issues. + Adapt the code under their guidance until they are all resolved. + + 7. Finally, the pull request will get merged or rejected. + +See also [GitHub's guide on +contributing](https://help.github.com/articles/fork-a-repo). + +If you want to do multiple unrelated changes, use separate branches and pull +requests. + +Do not change the `VERSION` and `*.changes` files as this could lead to +conflicts. + +### Commits + +Each commit in the pull request should do only one thing, which is clearly +described by its commit message. Especially avoid mixing formatting changes and +functional changes into one commit. When writing commit messages, adhere to +[widely used +conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). + +If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure +you mention it in the commit message for cross-reference. Use format like +bnc#775814 or gh#yast/yast-foo#42. See also [GitHub +autolinking](https://help.github.com/articles/github-flavored-markdown#references) +and [openSUSE abbreviation +reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations). + +Additional Information +---------------------- + +If you have any question, feel free to ask at the [development mailing +list](http://lists.opensuse.org/yast-devel/) or at the +[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode. +We'll do our best to provide a timely and accurate answer. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.0/Rakefile new/yast2-country-3.1.1/Rakefile --- old/yast2-country-3.1.0/Rakefile 2013-10-03 15:34:15.000000000 +0200 +++ new/yast2-country-3.1.1/Rakefile 2014-01-27 11:48:03.000000000 +0100 @@ -1,6 +1,6 @@ require "yast/rake" -Packaging.configuration do |conf| +Yast::Tasks.configuration do |conf| #lets ignore license check for now conf.skip_license_check << /.*/ end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.0/VERSION new/yast2-country-3.1.1/VERSION --- old/yast2-country-3.1.0/VERSION 2013-10-03 15:34:15.000000000 +0200 +++ new/yast2-country-3.1.1/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.0/package/yast2-country.changes new/yast2-country-3.1.1/package/yast2-country.changes --- old/yast2-country-3.1.0/package/yast2-country.changes 2013-10-03 15:34:15.000000000 +0200 +++ new/yast2-country-3.1.1/package/yast2-country.changes 2014-01-27 11:48:03.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 21 09:16:47 UTC 2014 - jsrain(a)suse.cz + +- adjusted timezone dialog layout (fate#314695) +- 3.1.1 + +------------------------------------------------------------------- Wed Oct 2 14:46:53 UTC 2013 - lslezak(a)suse.cz - do not use *.spec.in template, use *.spec file with RPM macros diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.0/package/yast2-country.spec new/yast2-country-3.1.1/package/yast2-country.spec --- old/yast2-country-3.1.0/package/yast2-country.spec 2013-10-03 15:34:15.000000000 +0200 +++ new/yast2-country-3.1.1/package/yast2-country.spec 2014-01-27 11:48:03.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.1.0 +Version: 3.1.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -29,7 +29,7 @@ Source1: org.opensuse.yast.modules.yapi.time.policy Source2: org.opensuse.yast.modules.yapi.language.policy BuildRequires: perl-XML-Writer update-desktop-files yast2-testsuite yast2 yast2-perl-bindings -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: polkit-devel Requires: yast2-trans-stats yast2-perl-bindings timezone # XVersion.ycp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.0/timezone/src/include/timezone/dialogs.rb new/yast2-country-3.1.1/timezone/src/include/timezone/dialogs.rb --- old/yast2-country-3.1.0/timezone/src/include/timezone/dialogs.rb 2013-10-03 15:34:15.000000000 +0200 +++ new/yast2-country-3.1.1/timezone/src/include/timezone/dialogs.rb 2014-01-27 11:48:03.000000000 +0100 @@ -53,7 +53,7 @@ Yast.import "Timezone" Yast.import "Wizard" - @hwclock_s_initial = :none + @hwclock_s = @hwclock_s_initial = :none # if system clock is configured to sync with NTP @ntp_used = false @@ -135,6 +135,10 @@ # @return true if user changed the time (dialog accepted) def SetTimeDialog ntp_help_text = Convert.to_string(ntp_call("ui_help_text", {})) + + utc_only = Timezone.utc_only + textmode = Language.GetTextMode + # help text for set time dialog htext = Ops.add( _( @@ -145,6 +149,32 @@ ntp_help_text ) + if !utc_only + # help for time calculation basis: + # hardware clock references local time or UTC? + htext = htext + _( + "\n" + + "Specify whether your machine is set to local time or UTC in Hardware Clock Set To.\n" + + "Most PCs that also have other operating systems installed (such as Microsoft\n" + + "Windows) use local time.\n" + + "Machines that have only Linux installed are usually\n" + + "set to Universal Time Coordinated (UTC).\n" + + "If the hardware clock is set to UTC, your system can switch from standard time\n" + + "to daylight saving time and back automatically.\n" + + "\n" + ) + + # help text: extra note about localtim + htext = htext + _( + "\n" + + "Note: The internal system clock as used by the Linux kernel must\n" + + "always be in UTC, because this is the reference for the correct localtime\n" + + "in user space. If you are choosing localtime for CMOS clock,\n" + + "check the user manual for background information about side effects.\n" + + "" + ) + end + dt_widgets = false hour = "" @@ -252,55 +282,71 @@ dt_widgets = true end + hwclock_term = VBox( + CheckBox( + Id(:hwclock), + Opt(:hstretch, :notify), + # check box label + _("&Hardware Clock Set to UTC"), + @hwclock_s == :hwclock_utc + ), + textmode ? Label("") : Empty() + ) - - - cont = HBox( - HWeight(1, VBox()), - HWeight( - 6, - RadioButtonGroup( - Id(:rb), - VBox( - # radio button label (= how to setup time) - Left(RadioButton(Id(:manual), Opt(:notify), _("Manually"))), - VSpacing(0.5), - HBox( - HSpacing(3), - VBox( - Left(timeterm), - VSpacing(), - Left(dateterm), - VSpacing(), - HBox( - HSpacing(0.5), - Left( - # check box label - CheckBox( - Id(:change_now), - Opt(:notify), - _("Change the Time Now"), - true + cont = VBox( + HBox( + HWeight(1, VBox()), + HWeight( + 6, + RadioButtonGroup( + Id(:rb), + VBox( + # radio button label (= how to setup time) + Left(RadioButton(Id(:manual), Opt(:notify), _("Manually"))), + VSpacing(0.5), + HBox( + HSpacing(3), + VBox( + Left(timeterm), + VSpacing(), + Left(dateterm), + VSpacing(), + HBox( + HSpacing(0.5), + Left( + # check box label + CheckBox( + Id(:change_now), + Opt(:notify), + _("Change the Time Now"), + true + ) ) ) ) - ) - ), - VSpacing(1), - Left( - RadioButton( - Id(:ntp), - Opt(:notify), - # radio button label - _("Synchronize with NTP Server"), - false - ) - ), - ReplacePoint(Id(:rp), Empty()) + ), + VSpacing(1), + Left( + RadioButton( + Id(:ntp), + Opt(:notify), + # radio button label + _("Synchronize with NTP Server"), + false + ) + ), + ReplacePoint(Id(:rp), Empty()) + ) ) - ) + ), + HWeight(1, VBox()) ), - HWeight(1, VBox()) + VSpacing(2), + HBox( + HWeight(1, VBox()), + HWeight(6, utc_only ? Empty() : hwclock_term), + HWeight(1, VBox()) + ) ) Wizard.OpenAcceptDialog @@ -367,6 +413,38 @@ end end + if ret == :accept + # Get current settings. + # UTC vs. localtime, only if needed + # + @hwclock_s = :hwclock_utc + if !utc_only + @hwclock_s = UI.QueryWidget(Id(:hwclock), :Value) ? :hwclock_utc : :hwclock_localtime + + if !Timezone.windows_partition && @hwclock_s == :hwclock_localtime + # warning popup, in case local time is selected (bnc#732769) + if !Popup.ContinueCancel( + _( + "\n" + + "You selected local time, but only Linux seems to be installed on your system.\n" + + "In such case, it is strongly recommended to use UTC, and to click Cancel.\n" + + "\n" + + "If you want to keep local time, you must adjust the CMOS clock twice the year\n" + + "because of Day Light Saving switches. If you miss to adjust the clock, backups may fail,\n" + + "your mail system may drop mail messages, etc.\n" + + "\n" + + "If you use UTC, Linux will adjust the time automatically.\n" + + "\n" + + "Do you want to continue with your selection (local time)?" + ) + ) + ret = :not_next + next + end + end + end + end + if ret == :accept && ntp_rb # before the sync, save the time zone (bnc#467318) Timezone.Set( @@ -490,7 +568,7 @@ # So you can only specify the timezone." (ihno) if !Arch.s390 && !Mode.config # button text - settime = PushButton(Id(:settime), _("Cha&nge...")) + settime = PushButton(Id(:settime), _("Other &Settings...")) end textmode = Language.GetTextMode @@ -595,72 +673,58 @@ # title for combo box 'timezone' ComboBox(Id(:timezone), Opt(:notify), _("Time &Zone")) ) + ), + HSpacing(), + HWeight(1, VBox( + Left(Label(_("Date and Time"))), + Left(Label(Id(:date), date))) + ), + HSpacing(), + VBox( + Label(" "), + settime ) ) ) else - timezoneterm = HBox( - SelectionBox( - Id(:region), - Opt(:notify, :immediate), - # label text - _("&Region"), - Timezone.Region + timezoneterm = VBox( + HBox( + SelectionBox( + Id(:region), + Opt(:notify, :immediate), + # label text + _("&Region"), + Timezone.Region + ), + HSpacing(), + ReplacePoint( + Id(:tzsel), + # title for selection box 'timezone' + SelectionBox(Id(:timezone), Opt(:notify), _("Time &Zone")) + ) ), - HSpacing(), - ReplacePoint( - Id(:tzsel), - # title for selection box 'timezone' - SelectionBox(Id(:timezone), Opt(:notify), _("Time &Zone")) + HBox( + HSpacing(), + VBox( + Left(Label(_("Date and Time"))), + Left(Label(Id(:date), date)) + ), + HSpacing(), + VBox( + Label(" "), + settime + ), + HSpacing() ) ) end - hwclock_term = VBox( - CheckBox( - Id(:hwclock), - Opt(:hstretch, :notify), - # check box label - _("&Hardware Clock Set to UTC"), - hwclock == "-u" - ), - textmode ? Label("") : Empty() - ) contents = MarginBox( term(:leftMargin, 2), term(:rightMargin, 2), term(:topMargin, 0), term(:bottomMargin, 0.2), - VBox( - timezoneterm, - VSpacing(0.2), - VSquash( - HBox( - HWeight(1, utc_only ? Empty() : hwclock_term), - HSpacing(1), - # frame label - HWeight( - 1, - Frame( - Id(:time_fr), - time_frame_label, - MarginBox( - term(:leftMargin, 1.2), - term(:rightMargin, 1), - term(:topMargin, 0), - term(:bottomMargin, 0), - textmode ? - VBox( - Label(Id(:date), Opt(:outputField, :hstretch), date), - Right(settime) - ) : - HBox(Label(Id(:date), date), HStretch(), Right(settime)) - ) - ) - ) - ) - ) - ) + timezoneterm ) # cache for lists with timezone items timezones_for_region = {} @@ -763,37 +827,6 @@ "\n" ) - if !utc_only - # help for time calculation basis: - # hardware clock references local time or UTC? - help_text = Ops.add( - help_text, - _( - "\n" + - "Specify whether your machine is set to local time or UTC in Hardware Clock Set To.\n" + - "Most PCs that also have other operating systems installed (such as Microsoft\n" + - "Windows) use local time.\n" + - "Machines that have only Linux installed are usually\n" + - "set to Universal Time Coordinated (UTC).\n" + - "If the hardware clock is set to UTC, your system can switch from standard time\n" + - "to daylight saving time and back automatically.\n" + - "\n" - ) - ) - - # help text: extra note about localtim - help_text = Ops.add( - help_text, - _( - "\n" + - "Note: The internal system clock as used by the Linux kernel must\n" + - "always be in UTC, because this is the reference for the correct localtime\n" + - "in user space. If you are choosing localtime for CMOS clock,\n" + - "check the user manual for background information about side effects.\n" + - "" - ) - ) - end if !Arch.s390 && !Mode.config @@ -823,9 +856,9 @@ Wizard.SetDesktopTitleAndIcon("timezone") end - hwclock_s = hwclock == "-u" ? :hwclock_utc : :hwclock_localtime - hwclock_s_old = hwclock_s - @hwclock_s_initial = hwclock_s + @hwclock_s = hwclock == "-u" ? :hwclock_utc : :hwclock_localtime + hwclock_s_old = @hwclock_s + @hwclock_s_initial = @hwclock_s show_selected_region.call(sel, timezone) if timezone_selector @@ -856,7 +889,7 @@ timezone = tz changed_time = true if timezone != timezone_old timezone_old = timezone - SetTimezone(hwclock_s, timezone, false, changed_time) + SetTimezone(@hwclock_s, timezone, false, changed_time) end if timezone_selector UI.ChangeWidget(Id(:timezonemap), :CurrentItem, timezone) @@ -870,7 +903,7 @@ timezone = tz changed_time = true if timezone != timezone_old timezone_old = timezone - SetTimezone(hwclock_s, timezone, false, changed_time) + SetTimezone(@hwclock_s, timezone, false, changed_time) end end if SetTimeDialog() @@ -892,38 +925,6 @@ end elsif ret == :next || ret == :timezone || ret == :timezonemap || ret == :hwclock - # Get current settings. - # UTC vs. localtime, only if needed - # - hwclock_s = :hwclock_utc - if !utc_only - hwclock_s = Convert.to_boolean(UI.QueryWidget(Id(:hwclock), :Value)) ? - :hwclock_utc : - :hwclock_localtime - - if ret == :next && !Timezone.windows_partition && - hwclock_s == :hwclock_localtime - # warning popup, in case local time is selected (bnc#732769) - if !Popup.ContinueCancel( - _( - "\n" + - "You selected local time, but only Linux seems to be installed on your system.\n" + - "In such case, it is strongly recommended to use UTC, and to click Cancel.\n" + - "\n" + - "If you want to keep local time, you must adjust the CMOS clock twice the year\n" + - "because of Day Light Saving switches. If you miss to adjust the clock, backups may fail,\n" + - "your mail system may drop mail messages, etc.\n" + - "\n" + - "If you use UTC, Linux will adjust the time automatically.\n" + - "\n" + - "Do you want to continue with your selection (local time)?" - ) - ) - ret = :not_next - next - end - end - end if ret == :timezonemap timezone = Convert.to_string( UI.QueryWidget(Id(:timezonemap), :Value) @@ -958,12 +959,12 @@ end Builtins.y2milestone("timezone %1 ret %2", timezone, ret) - if timezone != timezone_old || hwclock_s != hwclock_s_old || + if timezone != timezone_old || @hwclock_s != hwclock_s_old || ret == :next changed_time = true if timezone != timezone_old timezone_old = timezone - hwclock_s_old = hwclock_s - SetTimezone(hwclock_s, timezone, ret == :next, changed_time) + hwclock_s_old = @hwclock_s + SetTimezone(@hwclock_s, timezone, ret == :next, changed_time) end if ret == :next @@ -975,8 +976,8 @@ Timezone.ntp_used = @ntp_used # See bnc#638185c5: refresh_initrd should be called if HWCLOCK is changed (--localtime <-> --utc) and/or # if --localtime is set and TIMEZONE will be changed. - if hwclock_s != @hwclock_s_initial || - hwclock_s == :hwclock_localtime && timezone != timezone_initial + if @hwclock_s != @hwclock_s_initial || + @hwclock_s == :hwclock_localtime && timezone != timezone_initial Timezone.call_mkinitrd = true end continue with "q"... Checked in at Mon Jan 27 16:08:06 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org To contact the owner, e-mail: yast-devel+owner(a)opensuse.org

1 0

[yast-devel] [ci_new_pac] JFYI yast2-add-on -> sle12
by ro 27 Jan '14

27 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/yast2-add-on -> sle12 ## BNC# 846011 : "autoyast forgets configuration when any addon repository is added" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-add-on/yast2-add-on.changes 2014-01-17 14:16:26.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-add-on/yast2-add-on.changes 2014-01-17 16:46:48.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 17 15:42:12 UTC 2014 - vmoravec(a)suse.com + +- Fix autoyast config file issue BNC#846011 +- 3.1.2 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - installation-images - installation-images-extras - yast2-add-on - yast2-schema ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-add-on (Old) and /mounts/work_src_done/SLE12/yast2-add-on (BS:build ID:31189 MAIL:yast-devel@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-add-on", Maintainer is "yast-devel(a)opensuse.org" Old: ---- yast2-add-on-3.1.1.tar.bz2 New: ---- yast2-add-on-3.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.ZhBPMw/_old 2014-01-27 16:07:27.000000000 +0100 +++ /var/tmp/diff_new_pack.ZhBPMw/_new 2014-01-27 16:07:27.000000000 +0100 @@ -17,17 +17,20 @@ Name: yast2-add-on -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 + +Group: System/YaST +License: GPL-2.0 Requires: autoyast2-installation # ProductProfile Requires: yast2 >= 3.0.1 -Requires: yast2-country Requires: yast2-installation +Requires: yast2-country # AddOnProduct::SetRepoUrlAlias() Requires: yast2-packager >= 2.23.1 @@ -35,12 +38,12 @@ Requires: yast2-storage >= 2.16.1 BuildRequires: update-desktop-files +BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2 >= 3.0.1 -BuildRequires: yast2-devtools >= 3.0.6 # splitted from yast2-installation -Provides: yast2-installation:/usr/share/YaST2/clients/add-on.ycp Provides: yast2-installation:/usr/share/YaST2/clients/vendor.ycp +Provides: yast2-installation:/usr/share/YaST2/clients/add-on.ycp # SCR::RegisterNewAgents, bugzilla #245508 Conflicts: yast2-core < 2.15.4 @@ -48,21 +51,19 @@ # Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile Conflicts: yast2-pkg-bindings < 2.17.25 -BuildArch: noarch +BuildArchitectures: noarch Requires: yast2-ruby-bindings >= 1.0.0 Summary: YaST2 - Add-On media installation code -License: GPL-2.0 -Group: System/YaST %description This package contains YaST Add-On media installation code. %package devel-doc Requires: yast2-add-on = %version -Summary: YaST2 - Add-on - Development Documentation Group: System/YaST +Summary: YaST2 - Add-on - Development Documentation %description devel-doc This package contains development documentation for using the API @@ -77,6 +78,7 @@ %install %yast_install + %files %defattr(-,root,root) %dir %{yast_yncludedir}/add-on @@ -94,4 +96,3 @@ %files devel-doc %doc %{yast_docdir}/autodocs -%changelog ++++++ yast2-add-on-3.1.1.tar.bz2 -> yast2-add-on-3.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.1/VERSION new/yast2-add-on-3.1.2/VERSION --- old/yast2-add-on-3.1.1/VERSION 2013-11-15 12:56:12.000000000 +0100 +++ new/yast2-add-on-3.1.2/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.1/package/yast2-add-on.changes new/yast2-add-on-3.1.2/package/yast2-add-on.changes --- old/yast2-add-on-3.1.1/package/yast2-add-on.changes 2013-11-15 12:56:12.000000000 +0100 +++ new/yast2-add-on-3.1.2/package/yast2-add-on.changes 2014-01-27 11:36:38.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 17 15:42:12 UTC 2014 - vmoravec(a)suse.com + +- Fix autoyast config file issue BNC#846011 +- 3.1.2 + +------------------------------------------------------------------- Wed Nov 13 15:56:18 UTC 2013 - jreidinger(a)suse.com - Add explicit COPYING file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.1/package/yast2-add-on.spec new/yast2-add-on-3.1.2/package/yast2-add-on.spec --- old/yast2-add-on-3.1.1/package/yast2-add-on.spec 2013-11-15 12:56:12.000000000 +0100 +++ new/yast2-add-on-3.1.2/package/yast2-add-on.spec 2014-01-27 11:36:38.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,7 +38,7 @@ Requires: yast2-storage >= 2.16.1 BuildRequires: update-desktop-files -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2 >= 3.0.1 # splitted from yast2-installation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.1/src/clients/add-on_auto.rb new/yast2-add-on-3.1.2/src/clients/add-on_auto.rb --- old/yast2-add-on-3.1.1/src/clients/add-on_auto.rb 2013-11-04 16:29:29.000000000 +0100 +++ new/yast2-add-on-3.1.2/src/clients/add-on_auto.rb 2014-01-27 11:36:38.000000000 +0100 @@ -156,9 +156,7 @@ elsif @func == "Write" @sources = {} - AddOnProduct.add_on_products = Builtins.maplist( - AddOnProduct.add_on_products - ) do |prod| + AddOnProduct.add_on_products.each do |prod| media = Ops.get_string(prod, "media_url", "") pth = Ops.get_string(prod, "product_dir", "/") if String.StartsWith(media, "relurl://") @@ -232,7 +230,7 @@ # Possibility to set name in control file, bnc #433981 if Builtins.haskey(prod, "name") name = Ops.get_string(prod, "name", "") - Builtins.y2milestone("Preferred name: %1", name) + Builtins.y2milestone("Preferred name: %1", name) # Or use the one returned by Pkg::RepositoryScan else repos_at_url = Pkg.RepositoryScan(media) @@ -294,7 +292,7 @@ Builtins.y2milestone("add-on_auto finished") Builtins.y2milestone("----------------------------------------") - deep_copy(@ret) + deep_copy(@ret) # EOF end continue with "q"... Checked in at Mon Jan 27 16:07:47 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org To contact the owner, e-mail: yast-devel+owner(a)opensuse.org

1 0

[yast-devel] [ci_new_pac] JFYI yast2 -> sle12
by ro 27 Jan '14

27 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/yast2 -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2/yast2.changes 2014-01-17 14:16:25.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2/yast2.changes 2014-01-22 08:09:52.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Jan 21 14:57:14 UTC 2014 - jreidinger(a)suse.com + +- remove from wizard icons for title as proposed by Ken + (fate#314695) +- 3.1.16 + +------------------------------------------------------------------- +Tue Jan 21 08:26:38 UTC 2014 - mfilka(a)suse.com + +- fate#316768 + - use wicked tools for network service restart / reload when + running in installation mode +- 3.1.15 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2 - at least 70 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2 (Old) and /mounts/work_src_done/SLE12/yast2 (BS:build ID:31192 MAIL:yast-devel@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2", Maintainer is "yast-devel(a)opensuse.org" Old: ---- yast2-3.1.14.tar.bz2 New: ---- yast2-3.1.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.z4pqGK/_old 2014-01-27 16:06:22.000000000 +0100 +++ /var/tmp/diff_new_pack.z4pqGK/_new 2014-01-27 16:06:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2 # -# 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,27 +17,23 @@ Name: yast2 -Version: 3.1.14 +Version: 3.1.16 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 +Group: System/YaST +License: GPL-2.0 Source1: yast2-rpmlintrc -BuildRequires: perl-XML-Writer -BuildRequires: update-desktop-files +BuildRequires: perl-XML-Writer update-desktop-files yast2-perl-bindings yast2-testsuite BuildRequires: yast2-devtools >= 3.1.10 -BuildRequires: yast2-perl-bindings -BuildRequires: yast2-testsuite # Needed already in build time -BuildRequires: yast2-core >= 2.18.12 -BuildRequires: yast2-pkg-bindings >= 2.20.3 -BuildRequires: yast2-ycp-ui-bindings >= 2.18.4 +BuildRequires: yast2-core >= 2.18.12 yast2-pkg-bindings >= 2.20.3 yast2-ycp-ui-bindings >= 2.18.4 # Needed for tests -BuildRequires: grep -BuildRequires: rubygem-rspec +BuildRequires: rubygem-rspec grep # for symlinking yardoc duplicates BuildRequires: fdupes @@ -62,10 +58,8 @@ Requires: perl-Config-Crontab # for ag_tty (/bin/stty) # for /usr/bin/md5sum -Requires: coreutils -Requires: sysconfig >= 0.80.0 -Requires: yast2-hardware-detection -Requires: yast2-xml +Requires: coreutils sysconfig >= 0.80.0 +Requires: yast2-xml yast2-hardware-detection # for SLPAPI.pm Requires: yast2-perl-bindings # for ag_anyxml @@ -110,32 +104,24 @@ Provides: yast2-lib-sequencer Obsoletes: yast2-lib-sequencer -Provides: yast2-lib-wizard -Provides: yast2-lib-wizard-devel -Provides: yast2-trans-wizard -Obsoletes: yast2-lib-wizard -Obsoletes: yast2-lib-wizard-devel -Obsoletes: yast2-trans-wizard -Provides: y2t_menu -Provides: yast2-trans-menu -Obsoletes: y2t_menu -Obsoletes: yast2-trans-menu +Provides: yast2-lib-wizard yast2-lib-wizard-devel yast2-trans-wizard +Obsoletes: yast2-lib-wizard yast2-lib-wizard-devel yast2-trans-wizard +Provides: yast2-trans-menu y2t_menu +Obsoletes: yast2-trans-menu y2t_menu # moved here from another packages -Provides: yast2-dns-server:/usr/share/YaST2/modules/DnsServerAPI.pm -Provides: yast2-installation:/usr/share/YaST2/modules/Hotplug.ycp -Provides: yast2-installation:/usr/share/YaST2/modules/HwStatus.ycp Provides: yast2-installation:/usr/share/YaST2/modules/Installation.ycp Provides: yast2-installation:/usr/share/YaST2/modules/Product.ycp -Provides: yast2-mail-aliases +Provides: yast2-installation:/usr/share/YaST2/modules/Hotplug.ycp +Provides: yast2-installation:/usr/share/YaST2/modules/HwStatus.ycp Provides: yast2-network:/usr/share/YaST2/modules/Internet.ycp Provides: yast2-packager:/usr/lib/YaST2/servers_non_y2/ag_anyxml +Provides: yast2-dns-server:/usr/share/YaST2/modules/DnsServerAPI.pm +Provides: yast2-mail-aliases Requires: yast2-ruby-bindings >= 1.0.0 Summary: YaST2 - Main Package -License: GPL-2.0 -Group: System/YaST %description This package contains scripts and data needed for SuSE Linux @@ -143,14 +129,14 @@ %package devel-doc Requires: yast2 = %version +Group: System/YaST Provides: yast2-lib-sequencer-devel -Obsoletes: yast2-devel Obsoletes: yast2-lib-sequencer-devel +Obsoletes: yast2-devel Provides: yast2-devel Requires: yast2-core-devel Summary: YaST2 - Development Scripts and Documentation -Group: System/YaST %description devel-doc This package contains scripts and data needed for a SUSE Linux @@ -188,6 +174,7 @@ # because of the compression) %fdupes -s %buildroot/%_prefix/share/doc/packages/yast2 + %post %{fillup_only -n yast2} ++++++ yast2-3.1.14.tar.bz2 -> yast2-3.1.16.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.14/library/control/src/modules/ProductFeatures.rb new/yast2-3.1.16/library/control/src/modules/ProductFeatures.rb --- old/yast2-3.1.14/library/control/src/modules/ProductFeatures.rb 2014-01-14 11:06:31.000000000 +0100 +++ new/yast2-3.1.16/library/control/src/modules/ProductFeatures.rb 2014-01-27 11:42:09.000000000 +0100 @@ -2,7 +2,7 @@ # *************************************************************************** # -# Copyright (c) 2002 - 2012 Novell, Inc. +# Copyright (c) 2002 - 2014 Novell, Inc. # All Rights Reserved. # # This program is free software; you can redistribute it and/or @@ -206,10 +206,8 @@ # @return [String] the feature value def GetStringFeature(section, feature) value = GetFeature(section, feature) - if value == nil - return nil - elsif Ops.is_string?(value) - return Convert.to_string(value) + if Ops.is_string?(value) + return value elsif Ops.is_boolean?(value) return Convert.to_boolean(value) ? "yes" : "no" else @@ -218,16 +216,16 @@ end # Get value of a feature + # If the feature is missing false is returned. So it is not possible to + # distingush between a missing value and a false value. # @note This is a stable API function # @param [String] section string section of the feature # @param features string feature name # @return [Boolean] the feature value def GetBooleanFeature(section, feature) value = GetFeature(section, feature) - if value == nil - return nil - elsif Ops.is_boolean?(value) - return Convert.to_boolean(value) + if Ops.is_boolean?(value) + return value elsif Ops.is_string?(value) && Builtins.tolower(Convert.to_string(value)) == "yes" return true @@ -243,10 +241,8 @@ # @return [Fixnum] the feature value def GetIntegerFeature(section, feature) value = GetFeature(section, feature) - if value == nil - return nil - elsif Ops.is_integer?(value) - return Convert.to_integer(value) + if Ops.is_integer?(value) + return value elsif Ops.is_string?(value) return Builtins.tointeger(Convert.to_string(value)) else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.14/library/general/doc/Hooks.md new/yast2-3.1.16/library/general/doc/Hooks.md --- old/yast2-3.1.14/library/general/doc/Hooks.md 2014-01-14 11:06:31.000000000 +0100 +++ new/yast2-3.1.16/library/general/doc/Hooks.md 2014-01-27 11:42:09.000000000 +0100 @@ -6,9 +6,12 @@ ## What is a hook -Hook is an action which will be triggered at some predefined checkpoint during -some workflow. The action includes searching for files located in a specific -directory matching some patterns and executing them sequentially. +Hook is an action which will be triggered at some predefined [checkpoint](#checkpoints) +during a running workflow. The action includes: + +* searching for files matching [pre-defined patterns](#file-name-format) in a specific + directory +* executing those files sequentially. The results of the scripts do not affect the workflow, failed script are registered and logged as well as the succeeded ones. The author of the hook scripts should @@ -73,8 +76,8 @@ The hooks are executed with **root** privileges so it is possible to perform any maintenance tasks. However, some workflows might you discourage to perform -any such actions as they can corrupt the specific workflow and the results -of the whole process, even if they might not visible instantly. +any such actions as they can corrupt the specific workflow or the results +of the whole process, even if they might not be visible instantly. ### Installation environment @@ -108,7 +111,146 @@ ## Checkpoints -The hooks are created and triggered at some specific events - checkpoints - -usually considered important for the workflow. If the hook finds no files in the -search path, the worfkflow process continues its job until the next checkpoint has -been reached. This will repeat for all checkpoints. +Hooks are created and triggered at some specific events - **checkpoints** - +considered important for the workflow. If a hook finds no files to be executed in the +search path, the worfkflow process continues to the next checkpoint. This will repeat +for all checkpoints until the worflow has finished. + +The checkpoints are specified separately for every workflow, even within a workflow the +checkpoints may vary, e.g. checkpoints within installation workflow are defined +special for every type of installation (e.g. autoinstallation, manual installation). +Some of the checkpoints are fixed, other may depend on some external definition of +the workflow (for installation the checkpoints depends on the control file definition). + + +## Installation checkpoints + +Installation makes the broadest use of hooks due to its possible customization and +system setup importance. There are at least 4 types of installation workflows which +partly share some of their hook checkpoints: + +* manual installation using GUI +* autoinstallation using a configuration file written in xml +* upgrade using GUI +* autoupgrade using a configuration file + +Workflows like upgrade, autoupgrade and others are not (yet) in scope of this document. + +### Main installation checkpoints + +There are four main checkpoints used commonly by all installation workflows. Their +names are: + +* installation_start +* installation_finish +* installation_aborted +* installation_failure + +Hook files referencing these checkpoints must not have any prefix in their names +(there are no **before_** nor **after_** prefixes). + +Examples of general installation hook scripts: + +* installation_start_[0-9][0-9]_custom_script_name +* installation_finish_[0-9][0-9]_custom_script_name +* installation_aborted_[0-9][0-9]_custom_script_name +* installation_failure_[0-9][0-9]_custom_script_name + +### Manual installation checkpoints + +These checkpoints trigger hooks during manual installation of the system using +the GUI. Their list may vary according to the control file entries (for more +information see this repository: https://github.com/yast/yast-installation-control) + +Hook scripts defined for these checkpoints are being run **before** or **after** the +checkpoint. Thus, the author of the hook files must pick the suitable prefix and +adapt the hook file name. + +This is a list of checkpoints which a manual installation might go +through including the main checkpoints in brackets just for completness +( **Notice:** The list below takes into consideration the basic user workflow for +installing a system. Doing a highly customized installation or adding some +add-ons during the installation will result in a modified list.) + + 1. [ installation_start ] + 2. setup_dhcp + 3. complex_welcome + 4. system_analysis + 5. installation_options + 6. disk_proposal + 7. timezone + 8. new_desktop + 9. user_first + 10. initial_installation_proposal + 11. prepareprogress + 12. prepdisk + 13. deploy_image + 14. kickoff + 15. rpmcopy + 16. addon_update_sources + 17. extraxources + 18. save_hardware_status + 19. copy_files_finish + 20. copy_systemfiles_finish + 21. switch_scr_finish + 22. ldconfig_finish + 23. save_config_finish + 24. default_target_finish + 25. desktop_finish + 26. storage_finish + 27. iscsi-client_finish + 28. kernel_finish + 29. x11_finish + 30. proxy_finish + 31. pkg_finish + 32. driver_update1_finish + 33. random_finish + 34. system_settings_finish + 35. bootloader_finish + 36. kdump_finish + 37. yast_inf_finish + 38. network_finish + 39. firewall_stage1_finish + 40. ntp-client_finish + 41. ssh_settings_finish + 42. ssh_service_finish + 43. save_hw_status_finish + 44. users_finish + 45. installation_settings_finish + 46. driver_update2_finish + 47. pre_umount_finish + 48. copy_logs_finish + 49. umount_finish + 50. [ installation_finish ] + +If for example the author of a hook file was looking for the point after the partitioning schema +of the disk has been done by the user in order to run some task, he would create a hook file +named ```after_disk_proposal_00_do_something_important``` . + + +### Autoinstallation checkpoints + +Checkpoints for installation via autoyast profile differ from those above by the fact +that there is no graphical guide through the configuration, hence no checkpoints like +those above from 2 to 13. Instead there are these: + +* autoinit +* autosetup +* initial_autoinstallation_proposal +* autoimage + +Those entries might vary due to different entries in you xml profile which drives +the autoinstallation workflow. The rest of the checkpoints listed above should not much differ. + + +## Report an issue + +In case you followed the notes above and you are still having an issue with executing your +script, please create a bug at http://bugzilla.novell.com. + +If you are missing something important in this documentation or you have a question, +please send your query to yast-devel mailing list yast-devel(a)opensuse.org. + + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.14/library/network/src/modules/NetworkService.rb new/yast2-3.1.16/library/network/src/modules/NetworkService.rb --- old/yast2-3.1.14/library/network/src/modules/NetworkService.rb 2014-01-14 11:06:31.000000000 +0100 +++ new/yast2-3.1.16/library/network/src/modules/NetworkService.rb 2014-01-27 11:42:09.000000000 +0100 @@ -67,6 +67,10 @@ :wicked => "wicked" } + SYSTEMCTL = "/bin/systemctl" + + WICKED = "/usr/sbin/wicked" + def main Yast.import "Service" Yast.import "NetworkConfig" @@ -79,9 +83,6 @@ # if false, read needs to do work @initialized = false - # Path to the systemctl command - @systemctl = "/bin/systemctl" - # Variable remembers that the question has been asked during this run already. # It avoids useless questions over and over again. @already_asked_for_NetworkManager = false @@ -90,7 +91,7 @@ # Helper to run systemctl actions # @return exit code def RunSystemCtl(service, action) - cmd = Builtins.sformat("%1 %2 %3.service", @systemctl, action, service) + cmd = Builtins.sformat("%1 %2 %3.service", SYSTEMCTL, action, service) ret = Convert.convert( SCR.Execute(path(".target.bash_output"), cmd, { "TERM" => "raw" }), :from => "any", @@ -100,6 +101,16 @@ Ops.get_integer(ret, "exit", -1) end + def run_wicked(*params) + cmd = "#{WICKED} #{params.join(" ")}" + ret = SCR.Execute( + path(".target.bash"), + cmd + ) + + Builtins.y2milestone("run_wicked: #{cmd} -> #{ret}") + end + # Whether a network service change were requested # @return true when service change were requested def Modified @@ -228,31 +239,22 @@ # Reload or restars the network service. def ReloadOrRestart - if IsActive() - if Modified() - # reload is not sufficient - RunSystemCtl("network", "stop") - EnableDisableNow() - RunSystemCtl("network", "start") - else - # reload may be unsupported - RunSystemCtl("network", "reload-or-try-restart") - end + if Mode.installation + # inst-sys is not running systemd nor sysV init, so systemctl call + # is not available and service has to be restarted directly + wicked_restart else - # always stop, it does not hurt if the net was stopped. - RunSystemCtl("network", "stop") - EnableDisableNow() - RunSystemCtl("network", "start") + systemctl_reload_restart end - - nil end # Restarts the network service def Restart - RunSystemCtl("network", "stop") - EnableDisableNow() - RunSystemCtl("network", "start") + if Mode.installation + wicked_restart + else + systemctl_restart + end nil end @@ -366,6 +368,38 @@ return @cached_name end + # Restarts wicked backend directly + def wicked_restart + run_wicked( "ifdown", "all") + run_wicked( "ifup", "all") + end + + # Restarts network backend using systemctl call + def systemctl_restart + RunSystemCtl("network", "stop") + EnableDisableNow() + RunSystemCtl("network", "start") + end + + # Restarts or reloads configuration for network backend when + # systemctl is available + def systemctl_reload_restart + if IsActive() + if Modified() + # reload is not sufficient + systemctl_restart + else + # reload may be unsupported + RunSystemCtl("network", "reload-or-try-restart") + end + else + # always stop, it does not hurt if the net was stopped. + systemctl_restart + end + + nil + end + publish :function => :Read, :type => "void ()" publish :function => :Modified, :type => "boolean ()" publish :function => :is_backend_available, :type => "boolean (symbol)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.14/library/wizard/src/modules/Wizard.rb new/yast2-3.1.16/library/wizard/src/modules/Wizard.rb --- old/yast2-3.1.14/library/wizard/src/modules/Wizard.rb 2014-01-14 11:06:32.000000000 +0100 +++ new/yast2-3.1.16/library/wizard/src/modules/Wizard.rb 2014-01-27 11:42:09.000000000 +0100 @@ -42,11 +42,6 @@ Yast.import "Directory" Yast.import "OSRelease" - # keep trailing "/" !! - @theme_path = Ops.add(Directory.themedir, "/current") - @icon_path = Ops.add(@theme_path, "/icons/22x22/apps") - @default_icon = Ops.add(@icon_path, "/yast.png") - @have_fancy_ui_cache = nil # this variable is set from Product:: constructor @@ -455,8 +450,6 @@ Label.NextButton ) ) - - UI.WizardCommand(term(:SetDialogIcon, @default_icon)) else OpenDialog(NextBackDialog()) UI.SetFocus(Id(:next)) @@ -484,7 +477,6 @@ # Don't let sloppy calls to Wizard::SetContents() disable this button by accident UI.WizardCommand(term(:ProtectNextButton, true)) - UI.WizardCommand(term(:SetDialogIcon, @default_icon)) else OpenDialog(AcceptDialog()) UI.SetFocus(Id(:accept)) @@ -513,7 +505,6 @@ # Don't let sloppy calls to Wizard::SetContents() disable this button by accident UI.WizardCommand(term(:ProtectNextButton, true)) - UI.WizardCommand(term(:SetDialogIcon, @default_icon)) else OpenDialog(OKDialog()) UI.SetFocus(Id(:ok)) @@ -539,8 +530,6 @@ Label.FinishButton ) ) - - UI.WizardCommand(term(:SetDialogIcon, @default_icon)) else OpenDialog(GenericDialog(AbortApplyFinishButtonBox())) UI.SetFocus(Id(:finish)) @@ -569,7 +558,6 @@ # Don't let sloppy calls to Wizard::SetContents() disable this button by accident UI.WizardCommand(term(:ProtectNextButton, true)) - UI.WizardCommand(term(:SetDialogIcon, @default_icon)) else OpenAcceptDialog() end @@ -597,7 +585,6 @@ # Don't let sloppy calls to Wizard::SetContents() disable this button by accident UI.WizardCommand(term(:ProtectNextButton, true)) - UI.WizardCommand(term(:SetDialogIcon, @default_icon)) else OpenDialog(GenericDialog(AbortAcceptButtonBox())) end @@ -622,8 +609,6 @@ Label.NextButton ) ) - - UI.WizardCommand(term(:SetDialogIcon, @default_icon)) else OpenNextBackDialog() end @@ -1039,7 +1024,6 @@ ) ) HideBackButton() - UI.WizardCommand(term(:SetDialogIcon, @default_icon)) else OpenDialog(NextBackDialog()) UI.SetFocus(Id(:next)) @@ -1168,7 +1152,7 @@ # Sets the wizard 'title' icon to the specified icon from the standard icon # directory. # - # @note This is a stable API function + # @note Deprecated. Do nothing. # # @param [String] icon_name name (without path) of the new icon # @see #ClearTitleIcon @@ -1177,24 +1161,16 @@ # SetTitleIcon ("yast-dns-server"); # def SetTitleIcon(icon_name) - icon = icon_name == "" ? - "" : - Ops.add(Ops.add(Ops.add(@icon_path, "/"), icon_name), ".png") - - UI.WizardCommand(term(:SetDialogIcon, icon)) - nil end # Clear the wizard 'title' icon, i.e. replace it with nothing # - # @note This is a stable API function + # @note Deprecated. Do nothing. # @see #SetTitleIcon # def ClearTitleIcon - UI.WizardCommand(term(:SetDialogIcon, "")) - nil end @@ -1228,6 +1204,8 @@ # Desktop file is placed in a special directory (/usr/share/applications/YaST2). # Parameter file is realative to that directory without ".desktop" suffix. # Warning: There are no desktop files in inst-sys. Use "SetTitleIcon" instead. + # @note do nothing. Title icon do not provide additional value + # and is distracting # # @param [String] file Icon name # @return [Boolean] true on success @@ -1238,17 +1216,6 @@ # // Sets the icon. # SetDesktopIcon ("lan") def SetDesktopIcon(file) - description = Desktop.ParseSingleDesktopFile(file) - - # fallback name for the dialog title - icon = Ops.get(description, "Icon") - - Builtins.y2debug("icon: %1", icon) - - return false if icon == nil - - SetTitleIcon(icon) - true end @@ -1258,6 +1225,7 @@ # Desktop file is placed in a special directory (/usr/share/applications/YaST2). # Parameter file is realative to that directory without ".desktop" suffix. # Warning: There are no desktop files in inst-sys. + # @deprecated Use SetDesktopTitle only as icon setting is removed # # @param [String] file desktop file name # @return [Boolean] true on success @@ -1273,17 +1241,6 @@ description = Desktop.ParseSingleDesktopFile(file) # fallback name for the dialog title - icon = Ops.get(description, "Icon") - - Builtins.y2debug("icon: %1", icon) - - if icon != nil - SetTitleIcon(icon) - else - result = false - end - - # fallback name for the dialog title name = Ops.get(description, "Name", _("Module")) Builtins.y2debug("Set dialog title: %1", name) @@ -1597,8 +1554,6 @@ Label.NextButton ) ) - - UI.WizardCommand(term(:SetDialogIcon, @default_icon)) else OpenDialog(GenericTreeDialog(BackAbortNextButtonBox())) UI.SetFocus(Id(:next)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.14/package/yast2.changes new/yast2-3.1.16/package/yast2.changes --- old/yast2-3.1.14/package/yast2.changes 2014-01-16 18:17:04.000000000 +0100 +++ new/yast2-3.1.16/package/yast2.changes 2014-01-27 11:42:09.000000000 +0100 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Tue Jan 21 14:57:14 UTC 2014 - jreidinger(a)suse.com + +- remove from wizard icons for title as proposed by Ken + (fate#314695) +- 3.1.16 + +------------------------------------------------------------------- +Tue Jan 21 08:26:38 UTC 2014 - mfilka(a)suse.com + +- fate#316768 + - use wicked tools for network service restart / reload when + running in installation mode +- 3.1.15 + +------------------------------------------------------------------- Thu Jan 16 15:56:21 UTC 2014 - jreidinger(a)suse.com - make the package owner of /usr/share/YaST2/lib diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.14/package/yast2.spec new/yast2-3.1.16/package/yast2.spec --- old/yast2-3.1.14/package/yast2.spec 2014-01-16 18:17:04.000000000 +0100 +++ new/yast2-3.1.16/package/yast2.spec 2014-01-27 11:42:09.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.14 +Version: 3.1.16 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build continue with "q"... Checked in at Mon Jan 27 16:07:13 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org To contact the owner, e-mail: yast-devel+owner(a)opensuse.org

1 0

[yast-devel] Request 215269 created by jreidinger (delete openSUSE:Factory/yast2-s390)
by Josef Reidinger 27 Jan '14

27 Jan '14

Visit https://build.opensuse.org/request/show/215269 Description: It is exclusive only for s390, so no reason to have it in factory. Actions: - delete package openSUSE:Factory/yast2-s390 To REVIEW against the previous version: osc request show --diff 215269 To ACCEPT the request: osc request accept 215269 --message="reviewed ok." To DECLINE the request: osc request decline 215269 --message="declined for reason xyz (see ... for background / policy / ...)." To REVOKE the request: osc request revoke 215269 --message="retracted because ..., sorry / thx / see better version ..." -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org To contact the owner, e-mail: yast-devel+owner(a)opensuse.org

5 7

[yast-devel] Request 215238 changed to declined (submit openSUSE:Factory/yast2-s390)
by Tomáš Chvátal 27 Jan '14

27 Jan '14

Visit https://build.opensuse.org/request/show/215238 State of request 215238 was changed by scarabeus_factory: review -> declined Comment: revoke as it is not really needed on Facotyr as the code is s390 specific. Actions: - submit YaST:Head/yast2-s390 => openSUSE:Factory/yast2-s390 -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org To contact the owner, e-mail: yast-devel+owner(a)opensuse.org

2 1

[yast-devel] [ci_new_pac] JFYI yast2-network -> sle12
by ro 27 Jan '14

27 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/yast2-network -> sle12 ## BNC# 859181 : "yast2-network: remove smpppd bits" (RESOLVED/FIXED) ## BNC# 846950 : "JJ: Use custom polici at DNS tab doesn't work" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes 2014-01-17 14:16:31.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes 2014-01-21 13:44:52.000000000 +0100 @@ -1,0 +2,23 @@ +Tue Jan 21 10:30:13 UTC 2014 - mfilka(a)suse.com + +- bnc#859181 + - dropped code related to smpppd (ifcfg: USERCONTROL) +- 3.1.15 + +------------------------------------------------------------------- +Wed Jan 15 07:49:36 UTC 2014 - mfilka(a)suse.com + +- bnc#846950 + - change in resolv conf policy detected and stored properly +- 3.1.14 + +------------------------------------------------------------------- +Thu Jan 9 11:11:08 UTC 2014 - mfilka(a)suse.com + +- Don't show the Add button for network devices during the + installation: configuring undetected ones is considered an + advanced operation that should be postponed to the installed + system. +- 3.1.13 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-network - at least 17 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-network (Old) and /mounts/work_src_done/SLE12/yast2-network (BS:build ID:31191 MAIL:yast-devel@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network", Maintainer is "yast-devel(a)opensuse.org" Old: ---- yast2-network-3.1.12.tar.bz2 New: ---- yast2-network-3.1.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.wWJI2U/_old 2014-01-27 12:51:09.000000000 +0100 +++ /var/tmp/diff_new_pack.wWJI2U/_new 2014-01-27 12:51:09.000000000 +0100 @@ -17,21 +17,21 @@ Name: yast2-network -Version: 3.1.12 +Version: 3.1.15 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 +Group: System/YaST +License: GPL-2.0 # should be required by devtools -BuildRequires: perl-XML-Writer -BuildRequires: pkgconfig -BuildRequires: rpm +BuildRequires: perl-XML-Writer pkgconfig rpm BuildRequires: update-desktop-files +BuildRequires: yast2-testsuite +BuildRequires: yast2-devtools >= 3.1.15 BuildRequires: yast2-country -BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-installation >= 2.15.27 -BuildRequires: yast2-testsuite # yast2 v3.1.11: wicked support BuildRequires: yast2 >= 3.1.11 @@ -57,12 +57,10 @@ Requires: yast2-ruby-bindings >= 1.0.0 Summary: YaST2 - Network Configuration -License: GPL-2.0 -Group: System/YaST %package devel-doc -Summary: YaST2 - Developer documentation for yast2-network Group: System/YaST +Summary: YaST2 - Developer documentation for yast2-network %description This package contains the YaST2 component for network configuration. @@ -87,6 +85,7 @@ /bin/rm -f $RPM_BUILD_ROOT/%{yast_desktopdir}/network.desktop /bin/rm -f $RPM_BUILD_ROOT/%{yast_desktopdir}/provider.desktop + %post -p /bin/bash # This fixes the files that were touched when #24842 was in effect. # #42990: shut up when no wlan files are there. @@ -109,8 +108,8 @@ %{yast_agentdir}/ag_udev_persistent %{yast_schemadir}/autoyast/rnc/networking.rnc %{yast_schemadir}/autoyast/rnc/host.rnc -%dir %{_datadir}/YaST2/lib/ -%{_datadir}/YaST2/lib/network/ +%dir %{yast_libdir}/network +%{yast_libdir}/network %dir %{yast_docdir} %{yast_docdir}/COPYING ++++++ yast2-network-3.1.12.tar.bz2 -> yast2-network-3.1.15.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.12/package/yast2-network.changes new/yast2-network-3.1.15/package/yast2-network.changes --- old/yast2-network-3.1.12/package/yast2-network.changes 2013-12-17 13:48:08.000000000 +0100 +++ new/yast2-network-3.1.15/package/yast2-network.changes 2014-01-27 11:39:48.000000000 +0100 @@ -1,4 +1,27 @@ ------------------------------------------------------------------- +Tue Jan 21 10:30:13 UTC 2014 - mfilka(a)suse.com + +- bnc#859181 + - dropped code related to smpppd (ifcfg: USERCONTROL) +- 3.1.15 + +------------------------------------------------------------------- +Wed Jan 15 07:49:36 UTC 2014 - mfilka(a)suse.com + +- bnc#846950 + - change in resolv conf policy detected and stored properly +- 3.1.14 + +------------------------------------------------------------------- +Thu Jan 9 11:11:08 UTC 2014 - mfilka(a)suse.com + +- Don't show the Add button for network devices during the + installation: configuring undetected ones is considered an + advanced operation that should be postponed to the installed + system. +- 3.1.13 + +------------------------------------------------------------------- Fri Dec 13 11:03:05 UTC 2013 - mfilka(a)suse.com - wicked support - initial implementation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.12/package/yast2-network.spec new/yast2-network-3.1.15/package/yast2-network.spec --- old/yast2-network-3.1.12/package/yast2-network.spec 2013-12-17 13:48:08.000000000 +0100 +++ new/yast2-network-3.1.15/package/yast2-network.spec 2014-01-27 11:39:48.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.12 +Version: 3.1.15 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -29,7 +29,7 @@ BuildRequires: perl-XML-Writer pkgconfig rpm BuildRequires: update-desktop-files BuildRequires: yast2-testsuite -BuildRequires: yast2-devtools >= 3.1.10 +BuildRequires: yast2-devtools >= 3.1.15 BuildRequires: yast2-country BuildRequires: yast2-installation >= 2.15.27 @@ -108,8 +108,8 @@ %{yast_agentdir}/ag_udev_persistent %{yast_schemadir}/autoyast/rnc/networking.rnc %{yast_schemadir}/autoyast/rnc/host.rnc -%dir %{_datadir}/YaST2/lib/ -%{_datadir}/YaST2/lib/network/ +%dir %{yast_libdir}/network +%{yast_libdir}/network %dir %{yast_docdir} %{yast_docdir}/COPYING diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.12/src/Makefile.am new/yast2-network-3.1.15/src/Makefile.am --- old/yast2-network-3.1.12/src/Makefile.am 2013-12-17 13:48:08.000000000 +0100 +++ new/yast2-network-3.1.15/src/Makefile.am 2014-01-27 11:39:48.000000000 +0100 @@ -106,7 +106,7 @@ desktop/remote.desktop \ desktop/lan.desktop -ylibdir = "${yast2dir}/lib/network" +ylibdir = @ylibdir@/network ylib_DATA = \ lib/network/edit_nic_name.rb \ lib/network/confirm_virt_proposal.rb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.12/src/autoyast-rnc/networking.rnc new/yast2-network-3.1.15/src/autoyast-rnc/networking.rnc --- old/yast2-network-3.1.12/src/autoyast-rnc/networking.rnc 2013-12-17 13:48:08.000000000 +0100 +++ new/yast2-network-3.1.15/src/autoyast-rnc/networking.rnc 2014-01-27 11:39:48.000000000 +0100 @@ -45,6 +45,7 @@ bootproto? & startmode? & ifplugd_priority? & + # ignored, present for backward compatibility usercontrol? & # address diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.12/src/clients/inst_do_net_test.rb new/yast2-network-3.1.15/src/clients/inst_do_net_test.rb --- old/yast2-network-3.1.12/src/clients/inst_do_net_test.rb 2013-12-17 13:48:08.000000000 +0100 +++ new/yast2-network-3.1.15/src/clients/inst_do_net_test.rb 2014-01-27 11:39:48.000000000 +0100 @@ -459,35 +459,6 @@ Builtins.y2error("Command '%1' failed -> %2", run_command, ret_command) end - if Internet.logfile != "" - # label of combobox where the log is selected - @logs = Builtins.add( - @logs, - { - :menuname => _("PPP Daemon"), - :filename => "smpppd.log", - :prio => 20 - } - ) - run_command = Ops.add( - Ops.add( - Ops.add(Ops.add("/bin/cp '", String.Quote(Internet.logfile)), "' '"), - String.Quote(@logdir) - ), - "/smpppd.log'" - ) - ret_command = Convert.to_integer( - SCR.Execute(path(".target.bash"), run_command) - ) - if ret_command != 0 - Builtins.y2error( - "Command '%1' failed -> %2", - run_command, - ret_command - ) - end - end - nil end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.12/src/clients/lan_proposal.rb new/yast2-network-3.1.15/src/clients/lan_proposal.rb --- old/yast2-network-3.1.12/src/clients/lan_proposal.rb 2013-12-17 13:48:08.000000000 +0100 +++ new/yast2-network-3.1.15/src/clients/lan_proposal.rb 2014-01-27 11:39:48.000000000 +0100 @@ -116,7 +116,6 @@ @dev = Ops.get(@match, 0, "") # unescape colons @dev = Builtins.mergestring(Builtins.splitstring(@dev, "/"), ":") - # Lan::Edit (dev); Builtins.foreach(LanItems.Items) do |row, value| LanItems.current = row diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.12/src/include/network/installation/dialogs.rb new/yast2-network-3.1.15/src/include/network/installation/dialogs.rb --- old/yast2-network-3.1.12/src/include/network/installation/dialogs.rb 2013-12-17 13:48:08.000000000 +0100 +++ new/yast2-network-3.1.15/src/include/network/installation/dialogs.rb 2014-01-27 11:39:48.000000000 +0100 @@ -111,15 +111,6 @@ Internet.capi_isdn = Ops.get_string(Provider.Current, "PPPMODE", "ippp") == "capi-isdn" end - # Set logfile - if Internet.type == "dsl" || Internet.type == "modem" || - Internet.type == "isdn" && Internet.capi_isdn - Internet.logfile = Ops.add( - Ops.add("/var/log/smpppd/ifcfg-", Internet.device), - ".log" - ) - end - nil end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.12/src/include/network/lan/address.rb new/yast2-network-3.1.15/src/include/network/lan/address.rb --- old/yast2-network-3.1.12/src/include/network/lan/address.rb 2013-12-17 13:48:08.000000000 +0100 +++ new/yast2-network-3.1.15/src/include/network/lan/address.rb 2014-01-27 11:39:48.000000000 +0100 @@ -1266,7 +1266,6 @@ "STARTMODE" => LanItems.startmode( ), "IFPLUGD_PRIORITY" => LanItems.ifplugd_priority, - "USERCONTROL" => LanItems.usercontrol, # problems when renaming the interface? "FWZONE" => fwzone, "MTU" => LanItems.mtu, @@ -1541,8 +1540,6 @@ VSpacing(0.4), Frame(_("Firewall Zone"), HBox("FWZONE", HStretch())), VSpacing(0.4), - Frame(_("Device Control"), HBox("USERCONTROL", HStretch())), - VSpacing(0.4), Frame( _("Maximum Transfer Unit (MTU)"), HBox("MTU", HStretch()) @@ -1654,7 +1651,6 @@ ) LanItems.ifplugd_priority = ifp_prio if ifp_prio != nil end - LanItems.usercontrol = Ops.get_boolean(@settings, "USERCONTROL", false) if fw_is_installed zone = Ops.get_string(@settings, "FWZONE", "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.12/src/include/network/lan/complex.rb new/yast2-network-3.1.15/src/include/network/lan/complex.rb --- old/yast2-network-3.1.12/src/include/network/lan/complex.rb 2013-12-17 13:48:08.000000000 +0100 +++ new/yast2-network-3.1.15/src/include/network/lan/complex.rb 2014-01-27 11:39:48.000000000 +0100 @@ -121,9 +121,7 @@ ), VWeight(1, RichText(Id(:_hw_sum), "")), HBox( - PushButton(Id(:add), Label.AddButton), - PushButton(Id(:edit), Label.EditButton), - PushButton(Id(:delete), Label.DeleteButton), + *overview_buttons.map { |k,v| PushButton( Id(k), v) }, HStretch() ) ), @@ -186,12 +184,6 @@ :next end - # Display finished popup - # @return dialog result - # define symbol FinishDialog() ``{ - # return FinishPopup(Modified(), "lan", "", "mail", ["permanent"]); - # } - # Read settings dialog # @return `abort if aborted and `next otherwise def ReadDialog @@ -275,9 +267,8 @@ end end - # this is one of 3 places to install packages :-( + # this is one of 2 places to install packages :-( # - kernel modules (InstallKernel): before loaded - # - smpppd & qinternet: before net start # - wlan firmware: here, just because it is copied from modems # #45960 if LanItems.Requires != [] && LanItems.Requires != nil @@ -418,9 +409,7 @@ if !Mode.config && Lan.HaveXenBridge # #196479 # #178848 - Builtins.foreach([:add, :edit, :delete]) do |b| - UI.ChangeWidget(Id(b), :Enabled, false) - end + overview_buttons.keys.each { |b| UI.ChangeWidget(Id(b), :Enabled, false) } end nil @@ -499,7 +488,7 @@ UI.ChangeWidget(Id(:_hw_items), :Items, term_items) if !@shown - disableItemsIfNM([:_hw_items, :_hw_sum, :add, :edit, :delete], true) + disableItemsIfNM([:_hw_items, :_hw_sum] + overview_buttons.keys, true) @shown = true else enableDisableButtons @@ -512,7 +501,7 @@ def handleOverview(key, event) event = deep_copy(event) - if !disableItemsIfNM([:_hw_items, :_hw_sum, :add, :edit, :delete], false) + if !disableItemsIfNM([:_hw_items, :_hw_sum] + overview_buttons.keys, false) enableDisableButtons end UI.ChangeWidget(:_hw_sum, :Value, LanItems.GetItemDescription) @@ -679,4 +668,20 @@ nil end end + + private + def overview_buttons + ret = {} + + # User should be able to configure existing devices during installation. + # This can be achieved via "Edit" button on automatically detected + # devices. Advanced configuration should be postponed to installed system. + # Therefor adding devices is not available during installation + ret[:add] = Label.AddButton if !Mode.installation + ret[:edit] = Label.EditButton + ret[:delete] = Label.DeleteButton + + ret + end + end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.12/src/include/network/runtime.rb new/yast2-network-3.1.15/src/include/network/runtime.rb --- old/yast2-network-3.1.12/src/include/network/runtime.rb 2013-12-17 13:48:08.000000000 +0100 +++ new/yast2-network-3.1.15/src/include/network/runtime.rb 2014-01-27 11:39:48.000000000 +0100 @@ -69,42 +69,5 @@ true end - # Are there interfaces controlled by smpppd and qinternet? - # They are the ones with USERCONTROL=yes (#44303) - # @return true/false - def HaveDialupLikeInterfaces - devs = NetworkInterfaces.Locate("USERCONTROL", "yes") - Builtins.y2milestone("user controlled interfaces: %1", devs) - return true if devs != [] - - devs != [] - end - - # Setup smpppd(8) - # @return true if success - def SetupSMPPPD(install_force) - ret = true - # Stop and disable - if !HaveDialupLikeInterfaces() - ret = Service.Disable("smpppd") && ret - ret = Service.Stop("smpppd") && ret - else - # (#299033) - if not forced, user can continue also without packages - ret = PackageSystem.CheckAndInstallPackagesInteractive(["smpppd"]) - - ret = Service.Enable("smpppd") && ret - - # Installation? - if Mode.normal - if Service.Status("smpppd") == 0 - ret = Service.Reload("smpppd") && ret - else - ret = Service.Start("smpppd") && ret - end - end - end - - ret - end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.12/src/include/network/services/dns.rb new/yast2-network-3.1.15/src/include/network/services/dns.rb --- old/yast2-network-3.1.12/src/include/network/services/dns.rb 2013-12-17 13:48:08.000000000 +0100 +++ new/yast2-network-3.1.15/src/include/network/services/dns.rb 2014-01-27 11:39:48.000000000 +0100 @@ -28,6 +28,13 @@ # module Yast module NetworkServicesDnsInclude + + # CWM wants id-value pairs + CUSTOM_RESOLV_POLICIES = { + "STATIC" => "STATIC", + "STATIC_FALLBACK" => "STATIC_FALLBACK" + } + def initialize_network_services_dns(include_target) textdomain "network" @@ -160,10 +167,7 @@ "widget" => :combobox, "label" => _("&Custom Policy Rule"), "opt" => [:editable], - "items" => [ - [:static, "STATIC"], - [:static_fallback, "STATIC_FALLBACK"] - ], + "items" => CUSTOM_RESOLV_POLICIES.to_a, "init" => fun_ref(method(:initPolicy), "void (string)"), "handle" => fun_ref(method(:handlePolicy), "symbol (string, map)"), "help" => "" @@ -294,7 +298,8 @@ "HOSTNAME" => DNS.hostname, "DOMAIN" => DNS.domain, "DHCP_HOSTNAME" => DNS.dhcp_hostname, - "WRITE_HOSTNAME" => DNS.write_hostname + "WRITE_HOSTNAME" => DNS.write_hostname, + "PLAIN_POLICY" => DNS.resolv_conf_policy } # the rest is not so straightforward, # because we have list variables but non-list widgets @@ -335,6 +340,7 @@ DNS.searchlist = NonEmpty(searchlist) DNS.dhcp_hostname = Ops.get_boolean(settings, "DHCP_HOSTNAME", false) DNS.write_hostname = Ops.get_boolean(settings, "WRITE_HOSTNAME", true) + DNS.resolv_conf_policy = settings["PLAIN_POLICY"] # update modified flag DNS.modified = DNS.modified || settings != @settings_orig @@ -552,7 +558,6 @@ true end - def initPolicy(key) #first initialize correctly Builtins.y2milestone( @@ -578,30 +583,35 @@ event = deep_copy(event) Builtins.y2milestone("handlePolicy") - if UI.QueryWidget(Id("MODIFY_RESOLV"), :Value) == :custom - DNS.resolv_conf_policy = Convert.to_string( - UI.QueryWidget(Id("PLAIN_POLICY"), :Value) - ) - elsif UI.QueryWidget(Id("MODIFY_RESOLV"), :Value) == :auto - DNS.resolv_conf_policy = "auto" - else - DNS.resolv_conf_policy = "" + case UI.QueryWidget(Id("MODIFY_RESOLV"), :Value) + when :custom + SetHnItem("PLAIN_POLICY", UI.QueryWidget(Id("PLAIN_POLICY"), :Value)) + when :auto + SetHnItem("PLAIN_POLICY", "auto") + else + SetHnItem("PLAIN_POLICY", "") end nil end - def initModifyResolvPolicy(key) - Builtins.y2milestone("initModifyResolvPolicy") - #first initialize correctly + def modify_resolv_default if DNS.resolv_conf_policy == nil || DNS.resolv_conf_policy == "" - UI.ChangeWidget(Id("MODIFY_RESOLV"), :Value, Id(:nomodify)) - elsif DNS.resolv_conf_policy == "auto" || - DNS.resolv_conf_policy == "STATIC *" - UI.ChangeWidget(Id("MODIFY_RESOLV"), :Value, Id(:auto)) + Id(:nomodify) + elsif DNS.resolv_conf_policy == "auto" || DNS.resolv_conf_policy == "STATIC *" + Id(:auto) else - UI.ChangeWidget(Id("MODIFY_RESOLV"), :Value, Id(:custom)) + Id(:custom) end + end + + def initModifyResolvPolicy(key) + Builtins.y2milestone("initModifyResolvPolicy") + + #first initialize correctly + default = modify_resolv_default + + UI.ChangeWidget(Id("MODIFY_RESOLV"), :Value, default) #then disable if needed disableItemsIfNM(["MODIFY_RESOLV"], false) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.12/src/include/network/widgets.rb new/yast2-network-3.1.15/src/include/network/widgets.rb --- old/yast2-network-3.1.12/src/include/network/widgets.rb 2013-12-17 13:48:08.000000000 +0100 +++ new/yast2-network-3.1.15/src/include/network/widgets.rb 2014-01-27 11:39:48.000000000 +0100 @@ -45,24 +45,6 @@ Yast.include include_target, "network/complex.rb" @widget_descr = { - "USERCONTROL" => { - "widget" => :checkbox, - # CheckBox label - # is the interface administrable by users (as opposed to root) - "label" => _( - "E&nable Device Control for Non-root User Via QInternet" - ), - "opt" => [:notify], - "help" => - # Details dialog help - _( - "<big>Device Control</big>\n" + - "Usually, only the system administrator is allowed to activate and\n" + - "deactivate a network interface. With Enable Device Control for Non-root User\n" + - "Via QInternet, any user may control the interface via QInternet.This will require\n" + - "smpppd installed and running.\n" - ) - }, # #23315 "DIALPREFIXREGEX" => { "widget" => :textentry, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.12/src/modules/InternetDevices.rb new/yast2-network-3.1.15/src/modules/InternetDevices.rb --- old/yast2-network-3.1.12/src/modules/InternetDevices.rb 2013-12-17 13:48:08.000000000 +0100 +++ new/yast2-network-3.1.15/src/modules/InternetDevices.rb 2014-01-27 11:39:48.000000000 +0100 @@ -83,15 +83,6 @@ Internet.capi_isdn = Ops.get_string(Provider.Current, "PPPMODE", "ippp") == "capi-isdn" end - # Set logfile - if Internet.type == "dsl" || Internet.type == "modem" || - Internet.type == "isdn" && Internet.capi_isdn - Internet.logfile = Ops.add( - Ops.add("/var/log/smpppd/ifcfg-", Internet.device), - ".log" - ) - end - nil end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.12/src/modules/Lan.rb new/yast2-network-3.1.15/src/modules/Lan.rb --- old/yast2-network-3.1.12/src/modules/Lan.rb 2013-12-17 13:48:08.000000000 +0100 +++ new/yast2-network-3.1.15/src/modules/Lan.rb 2014-01-27 11:39:48.000000000 +0100 @@ -546,11 +546,6 @@ end # Progress stage 10 step_labels = Builtins.add(step_labels, _("Update configuration")) - if !NetworkService.is_network_manager && - !@write_only #(boolean) SCR::Read(.init.scripts.exists, "smpppd") && - # Progress stage 11 - step_labels = Builtins.add(step_labels, _("Set up smpppd")) - end Progress.New( caption, @@ -672,15 +667,6 @@ RunSuSEconfig() if !@write_only Builtins.sleep(sl) - if !NetworkService.is_network_manager && !@write_only - return false if Abort() - # Progress step 11 - ProgressNextStage(_("Setting up smpppd(8)...")) - # takes care of autoinst by itself - SetupSMPPPD(false) - Builtins.sleep(sl) - end - if NetworkService.is_network_manager network = false timeout = 15 @@ -920,16 +906,6 @@ true end - # Edit the given device - # @param [String] name device to edit - # @return true if success - def Edit(name) - LanItems.operation = nil - return false if LanItems.Select(name) != true - NetworkInterfaces.Edit(name) - LanItems.operation = :edit - true - end # Delete the given device # @param name device to delete # @return true if success @@ -1523,7 +1499,6 @@ publish :function => :Summary, :type => "list (string)" publish :function => :SummaryGeneral, :type => "list ()" publish :function => :Add, :type => "boolean ()" - publish :function => :Edit, :type => "boolean (string)" publish :function => :Delete, :type => "boolean ()" publish :function => :ProposeInterfaces, :type => "boolean ()" publish :function => :ProposeRoutesAndResolver, :type => "boolean ()" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.12/src/modules/LanItems.rb new/yast2-network-3.1.15/src/modules/LanItems.rb --- old/yast2-network-3.1.12/src/modules/LanItems.rb 2013-12-17 13:48:08.000000000 +0100 +++ new/yast2-network-3.1.15/src/modules/LanItems.rb 2014-01-27 11:39:48.000000000 +0100 @@ -84,7 +84,6 @@ @startmode = "auto" @ifplugd_priority = "0" - @usercontrol = false @mtu = "" @ethtool_options = "" @@ -225,7 +224,6 @@ "NAME" => "", "STARTMODE" => "manual", "IFPLUGD_PRIORITY" => "0", - "USERCONTROL" => "no", "WIRELESS_MODE" => "Managed", "WIRELESS_ESSID" => "", "WIRELESS_NWID" => "", @@ -1607,11 +1605,6 @@ # must be in sync with {#SetDefaultsForHW} def GetDefaultsForHW ret = {} - if @type == "wlan" - ret = Builtins.union( - ret, # #63767 - { "USERCONTROL" => "yes" } - ) # LCS eth interfaces on s390 need the MTU of 1492. #81815. # TODO: lcs, or eth? # will eth not get mapped to lcs? @@ -1620,7 +1613,7 @@ # #93798: limit to s390 to minimize regressions. Probably it could # be also done by only testing for lcs and not eth but that # would need more testing. - elsif Arch.s390 && Builtins.contains(["lcs", "eth"], @type) + if Arch.s390 && Builtins.contains(["lcs", "eth"], @type) Builtins.y2milestone("Adding LCS: setting MTU") ret = Builtins.add(ret, "MTU", "1492") end @@ -1630,16 +1623,9 @@ # must be in sync with {#GetDefaultsForHW} def SetDefaultsForHW Builtins.y2milestone("SetDefaultsForHW type %1", @type) - if @type == "wlan" - @usercontrol = true - elsif Arch.s390 && Builtins.contains(["lcs", "eth"], @type) + if Arch.s390 && Builtins.contains(["lcs", "eth"], @type) @mtu = "1492" end - # if (!needHwcfg(hw)){ - # nm_name_old = nm_name; - # nm_name = ""; - # } - # y2milestone("hwcfg name %1", nm_name); nil end @@ -1670,7 +1656,6 @@ @ethtool_options = GetDeviceVar(devmap, defaults, "ETHTOOL_OPTIONS") @startmode = GetDeviceVar(devmap, defaults, "STARTMODE") @ifplugd_priority = GetDeviceVar(devmap, defaults, "IFPLUGD_PRIORITY") - @usercontrol = GetDeviceVar(devmap, defaults, "USERCONTROL") == "yes" @description = GetDeviceVar(devmap, defaults, "NAME") @bond_option = GetDeviceVar(devmap, defaults, "BONDING_MODULE_OPTS") @vlan_etherdevice = GetDeviceVar(devmap, defaults, "ETHERDEVICE") @@ -1817,6 +1802,47 @@ nil end + def hotplug_usable? + true unless Ops.get_string(@Items, [@current, "hwinfo", "hotplug"], "").empty? + end + + def replace_ifplugd? + return true if !Arch.is_laptop + return true if NetworkService.is_network_manager + return true if ["bond", "vlan", "br"].include? type + + return false + end + + # returns default startmode for a new device + # + # startmode is returned according product, Arch and current device type + def new_device_startmode + product_startmode = ProductFeatures.GetStringFeature( + "network", + "startmode" + ) + + Builtins.y2milestone("Startmode by product: #{product_startmode}") + + case product_startmode + when "ifplugd" + if replace_ifplugd? + startmode = hotplug_usable? ? "hotplug" : "auto" + else + startmode = product_startmode + end + when "auto" + startmode = "auto" + else + startmode = hotplug_usable? ? "hotplug" : "auto" + end + + Builtins.y2milestone("New device startmode: #{startmode}") + + startmode + end + # Select the given device # @param [String] dev device to select ("" for new device, default values) # @return true if success @@ -1825,46 +1851,14 @@ devmap = {} # defaults for a new device devmap = { - # for hotplug devices set STARTMODE=hotplug (#132583) - "STARTMODE" => IsNotEmpty( - Ops.get_string(@Items, [@current, "hwinfo", "hotplug"], "") - ) ? "hotplug" : "auto", # #115448, #156388 "NETMASK" => Ops.get_string( NetHwDetection.result, "NETMASK", "255.255.255.0" ) } # #31369 - product_startmode = ProductFeatures.GetStringFeature( - "network", - "startmode" - ) - if Builtins.contains(["auto", "ifplugd"], product_startmode) - Builtins.y2milestone("Product startmode: %1", product_startmode) - if product_startmode == "ifplugd" && !Arch.is_laptop - # #164816 - Builtins.y2milestone("Not a laptop, will not prefer ifplugd") - product_startmode = IsNotEmpty( - Ops.get_string(@Items, [@current, "hwinfo", "hotplug"], "") - ) ? "hotplug" : "auto" - end - if product_startmode == "ifplugd" && NetworkService.is_network_manager - Builtins.y2milestone("For NetworkManager will not prefer ifplugd") - product_startmode = IsNotEmpty( - Ops.get_string(@Items, [@current, "hwinfo", "hotplug"], "") - ) ? "hotplug" : "auto" - end - if product_startmode == "ifplugd" && - Builtins.contains(["bond", "vlan", "br"], @type) - Builtins.y2milestone( - "For virtual networktypes (bond, bridge, vlan) will not prefer ifplugd" - ) - product_startmode = IsNotEmpty( - Ops.get_string(@Items, [@current, "hwinfo", "hotplug"], "") - ) ? "hotplug" : "auto" - end - Ops.set(devmap, "STARTMODE", product_startmode) - end + + devmap[ "STARTMODE"] = new_device_startmode @type = Ops.get_string(@Items, [@current, "hwinfo", "type"], "eth") @device = NetworkInterfaces.GetFreeDevice(@type) @@ -1948,7 +1942,6 @@ ) end end - Ops.set(newdev, "USERCONTROL", @usercontrol ? "yes" : "no") Ops.set(newdev, "BOOTPROTO", @bootproto) end Ops.set(newdev, "NAME", @description) @@ -2559,7 +2552,6 @@ publish :variable => :prefix, :type => "string" publish :variable => :startmode, :type => "string" publish :variable => :ifplugd_priority, :type => "string" - publish :variable => :usercontrol, :type => "boolean" publish :variable => :mtu, :type => "string" publish :variable => :ethtool_options, :type => "string" publish :variable => :wl_mode, :type => "string" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.12/test/Makefile.am new/yast2-network-3.1.15/test/Makefile.am --- old/yast2-network-3.1.12/test/Makefile.am 2013-12-17 13:48:08.000000000 +0100 +++ new/yast2-network-3.1.15/test/Makefile.am 2014-01-27 11:39:48.000000000 +0100 @@ -3,7 +3,8 @@ edit_nic_name_test.rb \ lan_udev_auto_test.rb \ bridge_test.rb \ - routing_test.rb + routing_test.rb \ + new_device_startmode_test.rb TEST_EXTENSIONS = .rb RB_LOG_COMPILER = rspec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.12/test/new_device_startmode_test.rb new/yast2-network-3.1.15/test/new_device_startmode_test.rb --- old/yast2-network-3.1.12/test/new_device_startmode_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-3.1.15/test/new_device_startmode_test.rb 2014-01-27 11:39:48.000000000 +0100 @@ -0,0 +1,104 @@ +#!rspec + +ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) + +require "yast" + +Yast.import "ProductFeatures" +Yast.import "LanItems" + +describe "LanItemsClass#new_device_startmode" do + + DEVMAP_STARTMODE_INVALID = { + "STARTMODE" => "invalid" + } + + ["hotplug", ""].each do |hwinfo_hotplug| + + expected_startmode = hwinfo_hotplug == "hotplug" ? "hotplug" : "auto" + hotplug_desc = hwinfo_hotplug == "hotplug" ? "can hotplug" : "cannot hotplug" + + context "When product_startmode is auto and device " + hotplug_desc do + + it "results to auto" do + expect(Yast::ProductFeatures) + .to receive(:GetStringFeature) + .with("network", "startmode") { "auto" } + + result = Yast::LanItems.new_device_startmode + expect(result).to be_eql "auto" + end + end + + context "When product_startmode is ifplugd and device " + hotplug_desc do + + before( :each) do + expect(Yast::ProductFeatures) + .to receive(:GetStringFeature) + .with("network", "startmode") { "ifplugd" } + Yast::LanItems.stub(:hotplug_usable?) { hwinfo_hotplug == "hotplug" } + # setup stubs by default at results which doesn't need special handling + Yast::Arch.stub(:is_laptop) { true } + Yast::NetworkService.stub(:is_network_manager) { false } + end + + it "results to #{expected_startmode} when not running on laptop" do + expect(Yast::Arch) + .to receive(:is_laptop) { false } + + result = Yast::LanItems.new_device_startmode + expect(result).to be_eql expected_startmode + end + + it "results to ifplugd when running on laptop" do + expect(Yast::Arch) + .to receive(:is_laptop) { true } + + result = Yast::LanItems.new_device_startmode + expect(result).to be_eql "ifplugd" + end + + it "results to #{expected_startmode} when running NetworkManager" do + expect(Yast::NetworkService) + .to receive(:is_network_manager) { true } + + result = Yast::LanItems.new_device_startmode + expect(result).to be_eql expected_startmode + end + + it "results to #{expected_startmode} when current device is virtual one" do + # check for virtual device type is done via Builtins.contains. I don't + # want to stub it because it requires default stub value definition for + # other calls of the function. It might have unexpected inpacts. + Yast::LanItems.stub(:type) { "bond" } + + result = Yast::LanItems.new_device_startmode + expect(result).to be_eql expected_startmode + end + end + + context "When product_startmode is not auto neither ifplugd" do + + AVAILABLE_PRODUCT_STARTMODES = [ + "hotplug", + "manual", + "off", + "nfsroot" + ] + + AVAILABLE_PRODUCT_STARTMODES.each do |product_startmode| + + it "for #{product_startmode} it results to #{expected_startmode} if device " + hotplug_desc do + expect(Yast::ProductFeatures) + .to receive(:GetStringFeature) + .with("network", "startmode") { product_startmode } + expect(Yast::LanItems) + .to receive(:hotplug_usable?) { hwinfo_hotplug == "hotplug" } + + result = Yast::LanItems.new_device_startmode + expect(result).to be_eql expected_startmode + end + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.12/testsuite/tests/runtime.out new/yast2-network-3.1.15/testsuite/tests/runtime.out --- old/yast2-network-3.1.12/testsuite/tests/runtime.out 2013-12-17 13:48:08.000000000 +0100 +++ new/yast2-network-3.1.15/testsuite/tests/runtime.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -Dump RunSuSEconfig -Execute .target.bash "/usr/lib/sendmail.d/update 2>/dev/null" 0 -Execute .target.bash "/usr/sbin/config.postfix 2>/dev/null" 0 -Return true -Execute .target.bash "/usr/lib/sendmail.d/update 2>/dev/null" 1 -Execute .target.bash "/usr/sbin/config.postfix 2>/dev/null" 1 -Return true -Dump SetupSMPPPD -Return true -Return false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.12/testsuite/tests/runtime.rb new/yast2-network-3.1.15/testsuite/tests/runtime.rb --- old/yast2-network-3.1.12/testsuite/tests/runtime.rb 2013-12-17 13:48:08.000000000 +0100 +++ new/yast2-network-3.1.15/testsuite/tests/runtime.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,96 +0,0 @@ -# encoding: utf-8 - -#*************************************************************************** -# -# Copyright (c) 2012 Novell, Inc. -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, contact Novell, Inc. -# -# To contact Novell about this file by physical or electronic mail, -# you may find current contact information at www.novell.com -# -#************************************************************************** -module Yast - class RuntimeClient < Client - def main - - # testedfiles: runtime.ycp Testsuite.ycp - - Yast.include self, "testsuite.rb" - - @READ = { - "init" => { "scripts" => { "exists" => true } }, - "probe" => { "system" => [] }, - "product" => { - "features" => { - "USE_DESKTOP_SCHEDULER" => "0", - "ENABLE_AUTOLOGIN" => "0", - "EVMS_CONFIG" => "0", - "IO_SCHEDULER" => "cfg", - "UI_MODE" => "expert" - } - }, - "sysconfig" => { - "language" => { - "RC_LANG" => "", - "DEFAULT_LANGUAGE" => "", - "ROOT_USES_LANG" => "no" - }, - "console" => { "CONSOLE_ENCODING" => "UTF-8" } - }, - "target" => { "size" => 1, "stat" => { "dummy" => true } } - } - - @EXEC = { "target" => { "bash_output" => {} } } - - TESTSUITE_INIT([@READ, {}, @EXEC], nil) - Yast.include self, "network/runtime.rb" - - @EXEC0 = { - "target" => { - "bash" => 0, - "bash_background" => 0, - "bash_output" => { "exit" => 0, "stdout" => "", "stderr" => "" } - } - } - - @EXEC1 = { - "target" => { - "bash" => 1, - "bash_background" => 1, - "bash_output" => { - "exit" => 1, - "stdout" => "", - "stderr" => "Dummy error message" - } - } - } - - DUMP("RunSuSEconfig") - TEST(lambda { RunSuSEconfig() }, [{}, {}, @EXEC0], nil) - TEST(lambda { RunSuSEconfig() }, [{}, {}, @EXEC1], nil) - - Yast.import "NetworkInterfaces" - NetworkInterfaces.instance_variable_set(:@Devices, { "dsl" => { "0" => {} } }) - - DUMP("SetupSMPPPD") - TEST(lambda { SetupSMPPPD(true) }, [@READ, {}, @EXEC0], nil) - TEST(lambda { SetupSMPPPD(false) }, [@READ, {}, @EXEC1], nil) - - nil - end - end -end - -Yast::RuntimeClient.new.main continue with "q"... Checked in at Mon Jan 27 12:52:29 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org To contact the owner, e-mail: yast-devel+owner(a)opensuse.org

1 0