Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at Mon Mar 22 17:11:25 CET 2010. -------- --- yast2/yast2.changes 2010-03-03 23:26:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2010-03-22 09:13:41.000000000 +0100 @@ -1,0 +2,25 @@ +Mon Mar 22 09:12:32 CET 2010 - mzugec@suse.cz + +- L3: autoinstallation with manual setup (bnc#568653) +- 2.19.10 + +------------------------------------------------------------------- +Tue Mar 16 15:28:33 CET 2010 - jsuchome@suse.cz + +- SERVICES.pm moved to webyast-services-ws (bnc#587876) +- 2.19.9 + +------------------------------------------------------------------- +Wed Mar 10 16:32:25 CET 2010 - locilka@suse.cz + +- Added special comments for translators to RTL languages + (BNC #584466). + +------------------------------------------------------------------- +Wed Mar 10 15:43:17 CET 2010 - mvidner@suse.cz + +- Mode::test(): check getenv instead of the UI + so that it works also in WebYaST (bnc#243624#c13). +- 2.19.8 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.19.7.tar.bz2 New: ---- yast2-2.19.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.UinzqM/_old 2010-03-22 17:11:03.000000000 +0100 +++ /var/tmp/diff_new_pack.UinzqM/_new 2010-03-22 17:11:03.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.19.7) +# spec file for package yast2 (Version 2.19.10) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2 -Version: 2.19.7 +Version: 2.19.10 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.19.7.tar.bz2 +Source0: yast2-2.19.10.tar.bz2 Prefix: /usr @@ -128,7 +128,7 @@ installation with YaST2. %prep -%setup -n yast2-2.19.7 +%setup -n yast2-2.19.10 %build %{prefix}/bin/y2tool y2autoconf @@ -185,7 +185,6 @@ %dir /usr/share/YaST2/images %dir /usr/share/YaST2/locale %dir /usr/share/YaST2/modules -%dir /usr/share/YaST2/modules/YaPI %dir /usr/share/YaST2/scrconf %dir %{prefix}/lib/YaST2/bin %dir /usr/share/YaST2/data @@ -203,7 +202,6 @@ /usr/share/YaST2/data/*.ycp /usr/share/YaST2/clients/* /usr/share/YaST2/modules/* -/usr/share/YaST2/modules/YaPI/*.pm /usr/share/YaST2/scrconf/* %{prefix}/lib/YaST2/bin/* /usr/lib/YaST2/servers_non_y2/ag_* ++++++ yast2-2.19.7.tar.bz2 -> yast2-2.19.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/VERSION new/yast2-2.19.10/VERSION --- old/yast2-2.19.7/VERSION 2010-03-03 23:09:50.000000000 +0100 +++ new/yast2-2.19.10/VERSION 2010-03-22 09:12:30.000000000 +0100 @@ -1 +1 @@ -2.19.7 +2.19.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/configure new/yast2-2.19.10/configure --- old/yast2-2.19.7/configure 2010-01-18 14:40:50.000000000 +0100 +++ new/yast2-2.19.10/configure 2009-11-10 15:53:52.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2 2.19.5. +# Generated by GNU Autoconf 2.63 for yast2 2.18.28. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.19.5' -PACKAGE_STRING='yast2 2.19.5' +PACKAGE_VERSION='2.18.28' +PACKAGE_STRING='yast2 2.18.28' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1277,7 +1277,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2 2.19.5 to adapt to many kinds of systems. +\`configure' configures yast2 2.18.28 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1348,7 +1348,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.19.5:";; + short | recursive ) echo "Configuration of yast2 2.18.28:";; esac cat <<\_ACEOF @@ -1428,7 +1428,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.19.5 +yast2 configure 2.18.28 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1442,7 +1442,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2 $as_me 2.19.5, which was +It was created by yast2 $as_me 2.18.28, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2422,7 +2422,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.19.5' + VERSION='2.18.28' cat >>confdefs.h <<_ACEOF @@ -2544,7 +2544,7 @@ -VERSION="2.19.5" +VERSION="2.18.28" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain@suse.cz>" @@ -3606,7 +3606,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2 $as_me 2.19.5, which was +This file was extended by yast2 $as_me 2.18.28, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3656,7 +3656,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2 config.status 2.19.5 +yast2 config.status 2.18.28 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/configure.in new/yast2-2.19.10/configure.in --- old/yast2-2.19.7/configure.in 2010-01-18 14:40:47.000000000 +0100 +++ new/yast2-2.19.10/configure.in 2009-11-10 15:53:48.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.19.5, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.18.28, http://bugs.opensuse.org/, yast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.19.5" +VERSION="2.18.28" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/agents/etc_ssh_sshd_config.scr new/yast2-2.19.10/library/agents/etc_ssh_sshd_config.scr --- old/yast2-2.19.7/library/agents/etc_ssh_sshd_config.scr 2009-06-01 13:16:00.000000000 +0200 +++ new/yast2-2.19.10/library/agents/etc_ssh_sshd_config.scr 2010-03-12 09:45:40.000000000 +0100 @@ -18,7 +18,7 @@ * Write(.etc.ssh.sshd_config.Compression, "no") * (true) * - * $Id: etc_ssh_sshd_config.scr 57028 2009-04-29 10:58:09Z lslezak $ + * $Id: etc_ssh_sshd_config.scr 61236 2010-03-10 15:39:50Z mvidner $ * * For more information about possible keys and values * consult with the sshd_config man pages `man sshd_config`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/agents/proc_mounts.scr new/yast2-2.19.10/library/agents/proc_mounts.scr --- old/yast2-2.19.7/library/agents/proc_mounts.scr 2009-06-01 13:16:00.000000000 +0200 +++ new/yast2-2.19.10/library/agents/proc_mounts.scr 2010-03-12 09:45:40.000000000 +0100 @@ -28,7 +28,7 @@ * ... * ]) * - * $Id: proc_mounts.scr 57258 2009-05-20 10:55:51Z aschnell $ + * $Id: proc_mounts.scr 61236 2010-03-10 15:39:50Z mvidner $ * * Returns a <b>list of maps</b>. Each map (list-entry) corresponds to i * one mount. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/agents/system_freespace.scr new/yast2-2.19.10/library/agents/system_freespace.scr --- old/yast2-2.19.7/library/agents/system_freespace.scr 2009-02-27 12:24:08.000000000 +0100 +++ new/yast2-2.19.10/library/agents/system_freespace.scr 2010-03-12 09:45:40.000000000 +0100 @@ -27,7 +27,7 @@ * not exist', 'Object is not a directory', '/bin/df does not exist on the * system' or 'Directory not defined'. Every error should appear in the y2log. * - * $Id: system_freespace.scr 55091 2009-01-27 16:34:31Z locilka $ + * $Id: system_freespace.scr 61236 2010-03-10 15:39:50Z mvidner $ * */ .system.freespace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/control/src/InstError.ycp new/yast2-2.19.10/library/control/src/InstError.ycp --- old/yast2-2.19.7/library/control/src/InstError.ycp 2009-06-01 13:15:59.000000000 +0200 +++ new/yast2-2.19.10/library/control/src/InstError.ycp 2010-03-12 09:45:40.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Module for reporting installation errors * Authors: Lukas Ocilka <locilka@suse.cz> * - * $Id: InstError.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id: InstError.ycp 61236 2010-03-10 15:39:50Z mvidner $ * * This module provides unified interface for reporting * installation errors. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/control/src/InstExtensionImage.ycp new/yast2-2.19.10/library/control/src/InstExtensionImage.ycp --- old/yast2-2.19.7/library/control/src/InstExtensionImage.ycp 2009-06-01 13:15:59.000000000 +0200 +++ new/yast2-2.19.10/library/control/src/InstExtensionImage.ycp 2010-03-12 09:45:40.000000000 +0100 @@ -5,7 +5,7 @@ * images for the inst-sys * Authors: Lukas Ocilka <locilka@suse.cz> * - * $Id: InstExtensionImage.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id: InstExtensionImage.ycp 61236 2010-03-10 15:39:50Z mvidner $ * * This module provides functions that download inst-sys extension images * (localization, fonts, ...) and merge them to the current int-sys. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/modules/Message.ycp new/yast2-2.19.10/library/modules/Message.ycp --- old/yast2-2.19.7/library/modules/Message.ycp 2008-12-18 14:46:52.000000000 +0100 +++ new/yast2-2.19.10/library/modules/Message.ycp 2010-03-12 09:45:40.000000000 +0100 @@ -6,7 +6,7 @@ * Copyright: Copyright 2004, Novell, Inc. All rights reserved. * Flags: Stable * - * $Id: Message.ycp 31242 2006-06-01 12:59:16Z locilka $ + * $Id: Message.ycp 61238 2010-03-10 15:42:02Z locilka $ * * Often used messages, for example error messages */ @@ -62,7 +62,11 @@ * @return string Cannot write settings to 'destination' */ global define string CannotWriteSettingsTo (string destination) { - /* TRANSLATORS: Popup message, %1 is file or service name like "/tmp/out" or "LDAP" */ + /* TRANSLATORS: Popup message, %1 is file or service name like "/tmp/out" or "LDAP" + * For Right-To-Left languages, you want to put %1 into its own empty line so + * the text renderer doesn't get trip with the English filename + * (see BNC #584466 for details) + */ return sformat(_("Cannot write settings to '%1'"), destination); } @@ -73,7 +77,11 @@ * @return string Cannot write settings to 'destination'\n\nReason: reason */ global define string CannotWriteSettingsToBecause (string destination, string reason) { - /* TRANSLATORS: Popup message, %1 is file or service name like "/tmp/out" or "LDAP", %2 is the reason of error */ + /* TRANSLATORS: Popup message, %1 is file or service name like "/tmp/out" or "LDAP", %2 is the reason of error + * For Right-To-Left languages, you want to put %1 into its own empty line so + * the text renderer doesn't get trip with the English filename + * (see BNC #584466 for details) + */ return sformat(_("Cannot write settings to '%1'. Reason: %2"), destination, reason); @@ -85,7 +93,11 @@ * @return string Error writing file 'file' */ global define string ErrorWritingFile (string file) { - /* TRANSLATORS: Popup message, %1 is a file name like "/tmp/out" */ + /* TRANSLATORS: Popup message, %1 is a file name like "/tmp/out" + * For Right-To-Left languages, you want to put %1 into its own empty line so + * the text renderer doesn't get trip with the English filename + * (see BNC #584466 for details) + */ return sformat(_("Error writing file '%1'"), file); } @@ -96,7 +108,11 @@ * @return string Error writing file 'file'\n\nReason: reason */ global define string ErrorWritingFileBecause (string file, string reason) { - /* TRANSLATORS: Popup message, %1 is a file name like "/tmp/out", %2 is the reason of error */ + /* TRANSLATORS: Popup message, %1 is a file name like "/tmp/out", %2 is the reason of error + * For Right-To-Left languages, you want to put %1 into its own empty line so + * the text renderer doesn't get trip with the English filename + * (see BNC #584466 for details) + */ return sformat(_("Error writing file '%1'. Reason: %2"), file, reason); @@ -108,7 +124,11 @@ * @return string Cannot open file 'file' */ global define string CannotOpenFile (string file) { - /* TRANSLATORS: Popup message, %1 is the name of file like "/tmp/in" */ + /* TRANSLATORS: Popup message, %1 is the name of file like "/tmp/in" + * For Right-To-Left languages, you want to put %1 into its own empty line so + * the text renderer doesn't get trip with the English filename + * (see BNC #584466 for details) + */ return sformat(_("Cannot open file '%1'"), file); } @@ -119,7 +139,11 @@ * @return string Cannot open file 'file'\n\nReason: reason */ global define string CannotOpenFileBecause (string file, string reason) { - /* TRANSLATORS: Popup message, %1 is the name of file like "/tmp/in", %2 is the reason of error */ + /* TRANSLATORS: Popup message, %1 is the name of file like "/tmp/in", %2 is the reason of error + * For Right-To-Left languages, you want to put %1 into its own empty line so + * the text renderer doesn't get trip with the English filename + * (see BNC #584466 for details) + */ return sformat(_("Cannot open file '%1'. Reason: %2"), file, reason); @@ -169,7 +193,11 @@ * @return string The directory '%1' does not exist.\nCreate it? */ global define string DirectoryDoesNotExistCreate (string directory) { - /* TRANSLATORS: Popup question */ + /* TRANSLATORS: Popup question + * For Right-To-Left languages, you want to put %1 into its own empty line so + * the text renderer doesn't get trip with the English directory + * (see BNC #584466 for details) + */ return sformat(_("The directory '%1' does not exist. Create it?"), directory); } @@ -220,7 +248,11 @@ * @return string Unable to create directory '%1'. */ global define string UnableToCreateDirectory (string directory) { - /* TRANSLATORS: Popup message, %1 is a directory name */ + /* TRANSLATORS: Popup message, %1 is a directory name + * For Right-To-Left languages, you want to put %1 into its own empty line so + * the text renderer doesn't get trip with the English directory + * (see BNC #584466 for details) + */ return sformat(_("Cannot create directory '%1'."), directory); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/modules/Mode.ycp new/yast2-2.19.10/library/modules/Mode.ycp --- old/yast2-2.19.7/library/modules/Mode.ycp 2008-12-18 14:46:52.000000000 +0100 +++ new/yast2-2.19.10/library/modules/Mode.ycp 2010-03-12 09:45:40.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Klaus Kaempf <kkaempf@suse.de> * Flags: Stable * - * $Id: Mode.ycp 47249 2008-05-02 12:55:31Z lslezak $ + * $Id: Mode.ycp 61236 2010-03-10 15:39:50Z mvidner $ * * Provide installation mode information. * Mostly values from /etc/install.inf @@ -132,14 +132,9 @@ if (_test == nil) Initialize (); if (!test_autochecked) { - - // do not call GetDisplayInfo in command line mode (bnc#374259) - if (commandline()) - { - _test = "none"; - } - else if (UI::GetDisplayInfo () == nil) { - _test = "testsuite"; // testsuite runs with a dummy ui. + // bnc#243624#c13: Y2ALLGLOBAL is set by yast2-testsuite/skel/runtest.sh + if (getenv ("Y2MODETEST") != nil || getenv ("Y2ALLGLOBAL") != nil) { + _test = "testsuite"; } test_autochecked = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/modules/Version.ycp new/yast2-2.19.10/library/modules/Version.ycp --- old/yast2-2.19.7/library/modules/Version.ycp 2010-03-03 23:11:16.000000000 +0100 +++ new/yast2-2.19.10/library/modules/Version.ycp 2010-03-22 09:13:03.000000000 +0100 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.19.7"; +global string yast2 = "2.19.10"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/network/agents/network.scr.in new/yast2-2.19.10/library/network/agents/network.scr.in --- old/yast2-2.19.7/library/network/agents/network.scr.in 2008-12-18 14:46:52.000000000 +0100 +++ new/yast2-2.19.10/library/network/agents/network.scr.in 2010-03-12 09:45:40.000000000 +0100 @@ -13,7 +13,7 @@ * VAR2="val 2 #blah" # comment2 * VAR3='val3 x #blah2' # comment3 * - * $Id: network.scr.in 49978 2008-08-12 10:45:02Z mvidner $ + * $Id: network.scr.in 61236 2010-03-10 15:39:50Z mvidner $ * * <p>Reads/writes <tt>@IFCFG_DIR@/ifcfg-*</tt>. For more details * see its own documentation.</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/network/agents/sysconfig_SuSEfirewall2.scr new/yast2-2.19.10/library/network/agents/sysconfig_SuSEfirewall2.scr --- old/yast2-2.19.7/library/network/agents/sysconfig_SuSEfirewall2.scr 2008-12-18 14:46:52.000000000 +0100 +++ new/yast2-2.19.10/library/network/agents/sysconfig_SuSEfirewall2.scr 2010-03-12 09:45:40.000000000 +0100 @@ -17,7 +17,7 @@ * // Don't forget to write nil to sync the settings! * Write(.sysconfig.SuSEfirewall2, nil) * - * $Id: sysconfig_SuSEfirewall2.scr 46270 2008-04-09 08:34:03Z locilka $ + * $Id: sysconfig_SuSEfirewall2.scr 61236 2010-03-10 15:39:50Z mvidner $ * * Read/Sets the values defined in /etc/sysconfig/SuSEfirewall2 * in an easy manner. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/packages/src/PackagesProposal.ycp new/yast2-2.19.10/library/packages/src/PackagesProposal.ycp --- old/yast2-2.19.7/library/packages/src/PackagesProposal.ycp 2009-06-01 13:16:00.000000000 +0200 +++ new/yast2-2.19.10/library/packages/src/PackagesProposal.ycp 2010-03-12 09:45:40.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: API for selecting or de-selecting packages for installation * Authors: Lukas Ocilka <locilka@suse.cz> * - * $Id: PackagesProposal.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id: PackagesProposal.ycp 61236 2010-03-10 15:39:50Z mvidner $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/packages/src/PackagesUI.ycp new/yast2-2.19.10/library/packages/src/PackagesUI.ycp --- old/yast2-2.19.7/library/packages/src/PackagesUI.ycp 2009-02-27 12:24:08.000000000 +0100 +++ new/yast2-2.19.10/library/packages/src/PackagesUI.ycp 2010-03-12 09:45:40.000000000 +0100 @@ -7,7 +7,7 @@ * Purpose: Provides common dialogs related to * the package management. * - * $Id: PackagesUI.ycp 55107 2009-01-28 10:56:44Z lslezak $ + * $Id: PackagesUI.ycp 61236 2010-03-10 15:39:50Z mvidner $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/packages/src/SlideShow.ycp new/yast2-2.19.10/library/packages/src/SlideShow.ycp --- old/yast2-2.19.7/library/packages/src/SlideShow.ycp 2009-03-23 19:17:16.000000000 +0100 +++ new/yast2-2.19.10/library/packages/src/SlideShow.ycp 2010-03-12 09:45:40.000000000 +0100 @@ -6,7 +6,7 @@ * Author: Stefan Hundhammer <sh@suse.de> * Stanislav Visnovsky <visnov@suse.cz> * - * $Id: SlideShow.ycp 56166 2009-03-17 11:36:29Z jsrain $ + * $Id: SlideShow.ycp 61236 2010-03-10 15:39:50Z mvidner $ * * Usage: * This is a generic module for handling global progress bar with optional slideshow/release notes etc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/runlevel/src/Makefile.am new/yast2-2.19.10/library/runlevel/src/Makefile.am --- old/yast2-2.19.7/library/runlevel/src/Makefile.am 2009-08-11 15:01:20.000000000 +0200 +++ new/yast2-2.19.10/library/runlevel/src/Makefile.am 2010-03-18 11:06:04.000000000 +0100 @@ -6,12 +6,7 @@ module_DATA = Service.ycp Runlevel.ycp -YaPI_perldir = @moduledir@/YaPI - -YaPI_perl_DATA = \ - YaPI/SERVICES.pm - EXTRA_DIST = $(agent_SCRIPTS) \ - $(scrconf_DATA) $(module_DATA) $(YaPI_perl_DATA) + $(scrconf_DATA) $(module_DATA) include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/runlevel/src/Makefile.in new/yast2-2.19.10/library/runlevel/src/Makefile.in --- old/yast2-2.19.7/library/runlevel/src/Makefile.in 2010-01-18 14:40:53.000000000 +0100 +++ new/yast2-2.19.10/library/runlevel/src/Makefile.in 2010-03-22 09:13:06.000000000 +0100 @@ -72,14 +72,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(YaPI_perldir)" \ - "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" \ - "$(DESTDIR)$(scrconfdir)" +am__installdirs = "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(moduledir)" \ + "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(scrconfdir)" SCRIPTS = $(agent_SCRIPTS) SOURCES = DIST_SOURCES = -DATA = $(YaPI_perl_DATA) $(module_DATA) $(modulebin_DATA) \ - $(scrconf_DATA) +DATA = $(module_DATA) $(modulebin_DATA) $(scrconf_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -203,12 +201,8 @@ agent_SCRIPTS = ag_initscripts scrconf_DATA = initscripts.scr module_DATA = Service.ycp Runlevel.ycp -YaPI_perldir = @moduledir@/YaPI -YaPI_perl_DATA = \ - YaPI/SERVICES.pm - EXTRA_DIST = $(agent_SCRIPTS) \ - $(scrconf_DATA) $(module_DATA) $(YaPI_perl_DATA) + $(scrconf_DATA) $(module_DATA) modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA)) modulebindir = $(moduledir) @@ -290,26 +284,6 @@ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(agentdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(agentdir)" && rm -f $$files -install-YaPI_perlDATA: $(YaPI_perl_DATA) - @$(NORMAL_INSTALL) - test -z "$(YaPI_perldir)" || $(MKDIR_P) "$(DESTDIR)$(YaPI_perldir)" - @list='$(YaPI_perl_DATA)'; test -n "$(YaPI_perldir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(YaPI_perldir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(YaPI_perldir)" || exit $$?; \ - done - -uninstall-YaPI_perlDATA: - @$(NORMAL_UNINSTALL) - @list='$(YaPI_perl_DATA)'; test -n "$(YaPI_perldir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(YaPI_perldir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(YaPI_perldir)" && rm -f $$files install-moduleDATA: $(module_DATA) @$(NORMAL_INSTALL) test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @@ -414,7 +388,7 @@ check: check-am all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(YaPI_perldir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(scrconfdir)"; do \ + for dir in "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(scrconfdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -464,8 +438,8 @@ info-am: -install-data-am: install-YaPI_perlDATA install-agentSCRIPTS \ - install-moduleDATA install-modulebinDATA install-scrconfDATA +install-data-am: install-agentSCRIPTS install-moduleDATA \ + install-modulebinDATA install-scrconfDATA install-dvi: install-dvi-am @@ -509,24 +483,22 @@ ps-am: -uninstall-am: uninstall-YaPI_perlDATA uninstall-agentSCRIPTS \ - uninstall-moduleDATA uninstall-modulebinDATA \ - uninstall-scrconfDATA +uninstall-am: uninstall-agentSCRIPTS uninstall-moduleDATA \ + uninstall-modulebinDATA uninstall-scrconfDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic dist-hook \ distclean distclean-generic distdir dvi dvi-am html html-am \ - info info-am install install-YaPI_perlDATA \ - install-agentSCRIPTS install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-moduleDATA install-modulebinDATA \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-scrconfDATA install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ - uninstall-YaPI_perlDATA uninstall-agentSCRIPTS uninstall-am \ + info info-am install install-agentSCRIPTS install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-moduleDATA \ + install-modulebinDATA install-pdf install-pdf-am install-ps \ + install-ps-am install-scrconfDATA install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-agentSCRIPTS uninstall-am \ uninstall-moduleDATA uninstall-modulebinDATA \ uninstall-scrconfDATA diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/runlevel/src/YaPI/SERVICES.pm new/yast2-2.19.10/library/runlevel/src/YaPI/SERVICES.pm --- old/yast2-2.19.7/library/runlevel/src/YaPI/SERVICES.pm 2010-03-03 23:06:42.000000000 +0100 +++ new/yast2-2.19.10/library/runlevel/src/YaPI/SERVICES.pm 1970-01-01 01:00:00.000000000 +0100 @@ -1,343 +0,0 @@ -package YaPI::SERVICES; - -use strict; -use YaST::YCP qw(:LOGGING); -use YaPI; -use Data::Dumper; - -# ------------------- imported modules -YaST::YCP::Import ("Directory"); -YaST::YCP::Import ("FileUtils"); -YaST::YCP::Import ("Package"); -YaST::YCP::Import ("Service"); -YaST::YCP::Import ("SCR"); -# ------------------------------------- - -our $VERSION = '1.0.0'; -our @CAPABILITIES = ('SLES11'); -our %TYPEINFO; - -my $custom_services_file = "/etc/webyast/custom_services.yml"; - -my $error_message = ""; - -# check for key presence in given list -sub contains { - my ( $list, $key, $ignorecase ) = @_; - if ( $ignorecase ) { - if ( grep /^$key$/i, @{$list} ) { - return 1; - } - } else { - if ( grep /^$key$/, @{$list} ) { - return 1; - } - } - return 0; -} - -# log error message and fill it into $error_message variable -sub report_error { - $error_message = shift; - y2error ($error_message); -} - -# parse the file with custom services and return the hash describing the file -sub parse_custom_services { - - if (!FileUtils->Exists ($custom_services_file)) { - report_error ("$custom_services_file file not present"); - return {}; - } - - if (!Package->Installed ("yast2-ruby-bindings")) { - report_error ("yast2-ruby-bindings not installed, cannot read custom services"); - return {}; - } - - if (!FileUtils->Exists (Directory->moduledir()."/YML.rb")) { - report_error ("YML.rb not present, cannot parse config file"); - return {}; - } - - YaST::YCP::Import ("YML"); - - my $parsed = YML->parse ($custom_services_file); - - if (!defined $parsed || ref ($parsed) ne "HASH") { - report_error ("custom services file could not be read"); - return {}; - } - return $parsed; -} - -# read the list of custom services and return the information about them -# if requested, read the status of services -sub read_custom_services { - - my $args = shift; - my @ret = (); - my $services = parse_custom_services (); - foreach my $name (keys %$services) { - my $s = { - "name" => $name - }; - $s->{"description"} = ($services->{$name}{"description"} || "") if $args->{"description"} || 0; - $s->{"shortdescription"}= ($services->{$name}{"shortdescription"} || "") if $args->{"shortdescription"} || 0; - - # read list of available commands, it may be limited for 'custom service' - my @commands = (); - foreach my $key (keys %{$services->{$name}}) { - if (contains (["start","stop","restart","reload","try-restart"], $key, 1)) { - push @commands, $key; - } - } - $s->{"commands"} = \@commands; - - if ($args->{"read_status"} || 0) - { - my $cmd = $services->{$name}{"status"}; - if (!$cmd) { - report_error ("status script for $name not defined or empty"); - next; - } - my $out = SCR->Execute (".target.bash_output", $cmd); - $s->{"status"} = $out->{"exit"}; - } - - push @ret, $s; - } - return \@ret; -} - -# read infomation about custom service and execute given command with it -sub execute_custom_script { - - my $name = shift; - my $action = shift; - my $services = parse_custom_services (); - my $ret = { - "stdout" => "", - "stderr" => "failure", - "exit" => 255 - }; - - if (%$services) { - my $service = $services->{$name}; - if (!defined $service || ref ($service) ne "HASH" || ! %$service) { - report_error ("service $name not defined or empty in config file"); - $ret->{"stderr"} = $error_message; - return $ret; - } - my $cmd = $services->{$name}{$action}; - if (!$cmd) { - report_error ("'$action' script for $name not defined or empty"); - $ret->{"stderr"} = $error_message; - return $ret; - } - $ret = SCR->Execute (".target.bash_output", $cmd); - } - return $ret; -} - -# Return the list of services enabled in given runlevel, or even all available. -# -# Parameter is an argument map with possible keys: -# "service" : if defined, only the status of _this given service_ will be returned (= list with one item) -# "runlevel" : integer; if not defined, current runlevel will be used -# "read_status" : if true, service status will be queried and returned for each service -# "custom" : if true, custom services (defined in config file) will be read (otherwise list of init.d services) -# "description" : if true, read the description of each service -# "only_enabled" : if true, return only list of services enabled in given runlevel -# - neither "start_runlevels", nor "enabled" key will be part of resulting maps -# "start_runlevels" if true, each service's result map will contain list of runlevels where it is started -# - if not present (or false), "enabled" key with boolean value will be returned instead -# "filter" : list of strings; defines filtered list of services that should be returned -# @returns array of hashes -BEGIN{$TYPEINFO{Read} = ["function", - ["list", [ "map", "string", "any"]], - ["map", "string", "any"]]; -} -sub Read { - - my $self = shift; - my $args = shift; - my @ret = (); - my $runlevel = SCR->Read (".init.scripts.current_runlevel"); - $runlevel = $args->{"runlevel"} if defined $args->{"runlevel"}; - - my @filter = (); - @filter = @{$args->{"filter"}} if defined $args->{"filter"}; - my $filter_map= {}; - foreach my $s (@filter) { - $filter_map->{$s} = 1; - } - - # only read status of one service if the name was given - if ($args->{"service"} || "") { - my $exec = $self->Execute ({ - "name" => $args->{"service"} || "", - "action" => "status", - "custom" => $args->{"custom"} || 0 - }); - my $s = { - "name" => $args->{"service"} || "", - "status" => $exec->{"exit"} || 0 - }; - push @ret, $s; - return \@ret; - } - - # read only custom services - if ($args->{"custom"} || 0) { - return read_custom_services ($args); - } - - if ($args->{"only_enabled"}) { - # generate the output list - foreach my $name (@{Service->EnabledServices ($runlevel)}) { - next if (@filter && !defined $filter_map->{$name}); # should not be returned - my $s = { - "name" => $name, - }; - $s->{"status"} = Service->Status ($name) if ($args->{"read_status"} || 0); - if (($args->{"description"} || 0) || ($args->{"shortdescription"} || 0)) { - my $info = Service->Info ($name); - $s->{"description"} = ($info->{"description"} || "") if $args->{"description"} || 0; - $s->{"shortdescription"}= ($info->{"shortdescription"} || "") if $args->{"shortdescription"} || 0; - } - push @ret, $s; - } - } - else { - my $details = SCR->Read (".init.scripts.runlevels"); - - # copied from RunlevelEd::Read - my $full_services = SCR->Read (".init.scripts.comments"); - while (my ($name, $info) = each %$full_services) { - - next if (@filter && !defined $filter_map->{$name}); # should not be returned - - my $second_service = $details->{$name} || {}; - - my $s = { - "name" => $name - }; - next if (contains ($info->{"defstart"} || [], "B", 1)); - - if ($args->{"start_runlevels"} || 0) { - $s->{"start_runlevels"} = $second_service->{"start"} || []; - } - else { - my $start = $second_service->{"start"} || []; - # for "B" check, see RunlevelEd::StartContainsImplicitly - $s->{"enabled"} = YaST::YCP::Boolean (contains ($start, $runlevel, 1) || contains ($start, "B", 1)); - } - $s->{"status"} = Service->Status ($name) if ($args->{"read_status"} || 0); - $s->{"description"} = ($info->{"description"} || "") if $args->{"description"} || 0; - $s->{"shortdescription"}= ($info->{"shortdescription"} || "") if $args->{"shortdescription"} || 0; - push @ret, $s; - } - } - - return \@ret; -} - -# Return the status of given service -# return value is the exit code of status function -BEGIN{$TYPEINFO{Get} = ["function", - "integer", "string" ]; -} -sub Get { - - my $self = shift; - my $name = shift; - - return Service->Status ($name); -} - -# Executes an action (e.g. "restart") with given service -# If the action is start or stop, it will also enable (resp. disable) -# the service for current runlevel. -# -# parameter is a map where "name" is service name, "action" means what to do -# - if "only_execute" key is present, do not continue with enabling/disabling -# - if action is "enable" or "disable", only enables/disables service -# - if "custom" key is present (with true value), indicates custom service, which -# has special handling. Also, custom service will not be enabled/disabled. -# -# return value is map with "exit", "stdout" and "stderr" keys -BEGIN{$TYPEINFO{Execute} = ["function", - [ "map", "string", "any"], - [ "map", "string", "any"]]; -} -sub Execute { - - my $self = shift; - - my $args = shift; - my $name = $args->{"name"} || ""; - my $action = $args->{"action"} || ""; - - return self->Enable ($args) if ($action eq "enable" || $action eq "disable"); - - if ($args->{"custom"} || 0) { - return execute_custom_script ($name, $action); - } - else { - my $ret = Service->RunInitScriptOutput ($name, $action); - if (($action eq "start" || $action eq "stop") && !($args->{"only_execute"} || 0)) { - if (($ret->{"exit"} || 0) ne 0) { - y2error ("action '$action' failed"); - return $ret; - } - if ($action eq "start") { - $args->{"action"} = "enable"; - } - else { - $args->{"action"} = "disable"; - } - return $self->Enable ($args); - } - return $ret; - } -} - -# Enable/Disable given service in current runlevel -# parameter is a map where "name" is service name, "action" means what to do -# return value is map with "exit", "stdout" and "stderr" keys -BEGIN{$TYPEINFO{Enable} = ["function", - [ "map", "string", "any"], - [ "map", "string", "any"]]; -} -sub Enable { - - my $self = shift; - my $args = shift; - my $name = $args->{"name"} || ""; - my $action = $args->{"action"} || ""; - my $ret = { - "stdout" => "", - "stderr" => "", - "exit" => 0 - }; - if ($action eq "enable") { - unless (Service->Enable ($name)) { - $ret->{"stderr"} = "Failed to enable service $name."; - $ret->{"exit"} = 1000; - } - } - elsif ($action eq "disable") { - unless (Service->Disable ($name)) { - $ret->{"stderr"} = "Failed to disable service $name."; - $ret->{"exit"} = 2000; - } - } - else { - $ret->{"stderr"} = "Unknown action '$action'"; - $ret->{"exit"} = 3; - } - return $ret; -} - -1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/wizard/src/Confirm.ycp new/yast2-2.19.10/library/wizard/src/Confirm.ycp --- old/yast2-2.19.7/library/wizard/src/Confirm.ycp 2008-12-18 14:46:52.000000000 +0100 +++ new/yast2-2.19.10/library/wizard/src/Confirm.ycp 2010-03-22 09:12:47.000000000 +0100 @@ -9,7 +9,7 @@ * * Flags: Stable * - * $Id: Confirm.ycp 53760 2008-12-01 10:47:25Z mzugec $ + * $Id: Confirm.ycp 61424 2010-03-22 08:12:46Z mzugec $ */ { @@ -38,6 +38,10 @@ global boolean Detection(string class, string icon_name) { if(Linuxrc::manual () != true) return true; + + // L3: no interaction in AY, just re-probe (bnc#568653) + if(Mode::autoinst () == true) return true; + if(Arch::s390()) return true; if( icon_name == nil ) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org