Hello community,
here is the log from the commit of package autoyast2
checked in at Fri Apr 4 01:24:47 CEST 2008.
--------
--- autoyast2/autoyast2.changes 2008-03-26 11:26:47.000000000 +0100
+++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2008-04-03 12:59:56.316300000 +0200
@@ -1,0 +2,26 @@
+Thu Apr 3 12:53:40 CEST 2008 - ug@suse.de
+
+- 2.16.13
+
+-------------------------------------------------------------------
+Wed Apr 2 16:45:44 CEST 2008 - lslezak@suse.cz
+
+- adapted to the new callback registration scheme (fate#302296)
+
+-------------------------------------------------------------------
+Tue Apr 1 12:08:54 CEST 2008 - ug@suse.de
+
+- "encryption switch" fixed when opening an encrypted profile
+
+-------------------------------------------------------------------
+Tue Apr 1 10:05:10 CEST 2008 - jsrain@suse.cz
+
+- merged texts from proofread
+
+-------------------------------------------------------------------
+Thu Mar 27 11:08:56 CET 2008 - ug@suse.de
+
+- XML profile on USB devices can make yast to hang when the profile
+ can not be found by autoyast (bnc#366550)
+
+-------------------------------------------------------------------
Old:
----
autoyast2-2.16.12.tar.bz2
New:
----
autoyast2-2.16.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.Y22198/_old 2008-04-04 01:24:25.000000000 +0200
+++ /var/tmp/diff_new_pack.Y22198/_new 2008-04-04 01:24:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package autoyast2 (Version 2.16.12)
+# spec file for package autoyast2 (Version 2.16.13)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,12 +13,12 @@
Url: http://www.suse.de/~ug
Name: autoyast2
-Version: 2.16.12
+Version: 2.16.13
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: autoyast2-2.16.12.tar.bz2
+Source0: autoyast2-2.16.13.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-country yast2-devtools yast2-mouse yast2-testsuite yast2-transfer yast2-update
# API for Disabled Modules (ProductControl)
@@ -53,7 +53,8 @@
Anas Nashif
%package installation
-Version: 2.16.12
+License: GPL v2 or later
+Version: 2.16.13
Release: 1
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
@@ -75,7 +76,7 @@
Anas Nashif
%prep
-%setup -n autoyast2-2.16.12
+%setup -n autoyast2-2.16.13
%build
%{prefix}/bin/y2tool y2autoconf
@@ -214,8 +215,18 @@
%dir /var/adm/autoinstall/cache
%dir /var/lib/autoinstall
%dir /var/lib/autoinstall/autoconf
-
%changelog
+* Thu Apr 03 2008 ug@suse.de
+- 2.16.13
+* Wed Apr 02 2008 lslezak@suse.cz
+- adapted to the new callback registration scheme (fate#302296)
+* Tue Apr 01 2008 ug@suse.de
+- "encryption switch" fixed when opening an encrypted profile
+* Tue Apr 01 2008 jsrain@suse.cz
+- merged texts from proofread
+* Thu Mar 27 2008 ug@suse.de
+- XML profile on USB devices can make yast to hang when the profile
+ can not be found by autoyast (bnc#366550)
* Tue Mar 25 2008 ug@suse.de
- back button for ask dialogs added (fate #303397)
- logging of "ask" changed to y2debug
@@ -1198,7 +1209,7 @@
- Re-enabled LVM and RAID
- Fixed Types
- 2.9.16
-* Mon Feb 23 2004 nashif@suse.de
+* Tue Feb 24 2004 nashif@suse.de
- Use new kernel names
- 2.9.15
* Thu Feb 19 2004 mvidner@suse.cz
@@ -1222,7 +1233,7 @@
* Sun Feb 08 2004 nashif@suse.de
- Fixes for new interpreter
- 2.9.7
-* Sun Feb 01 2004 nashif@suse.de
+* Mon Feb 02 2004 nashif@suse.de
- Fixes for new interpreter
- 2.9.6
* Sun Feb 01 2004 nashif@suse.de
@@ -1352,7 +1363,7 @@
- Fixed package selection dialogs
- doc updates
- 2.7.11
-* Thu Feb 20 2003 nashif@suse.de
+* Fri Feb 21 2003 nashif@suse.de
- adapted spec file
- use PkgInstall to tag package as selected by user
- various fixes
@@ -1502,7 +1513,7 @@
(for Restore module)
- Fix x11 data configuration (start_x11 was not configured)
- 2.6.22
-* Tue Sep 03 2002 nashif@suse.de
+* Wed Sep 04 2002 nashif@suse.de
- fixed hardware clock settings
- more adaptions to package manager
- partition table sorting fixes
@@ -1518,7 +1529,7 @@
- write displaymanager values only if X is available
- hwclock is not boolean when importing kickstart files
- 2.6.19
-* Wed Aug 28 2002 nashif@suse.de
+* Thu Aug 29 2002 nashif@suse.de
- remove checking for X11
- set locale for package manager
- doc updates
++++++ autoyast2-2.16.12.tar.bz2 -> autoyast2-2.16.13.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.12/configure new/autoyast2-2.16.13/configure
--- old/autoyast2-2.16.12/configure 2008-03-26 11:20:49.000000000 +0100
+++ new/autoyast2-2.16.13/configure 2008-04-03 12:54:02.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for autoyast2 2.16.12.
+# Generated by GNU Autoconf 2.61 for autoyast2 2.16.13.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='autoyast2'
PACKAGE_TARNAME='autoyast2'
-PACKAGE_VERSION='2.16.12'
-PACKAGE_STRING='autoyast2 2.16.12'
+PACKAGE_VERSION='2.16.13'
+PACKAGE_STRING='autoyast2 2.16.13'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1205,7 +1205,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 autoyast2 2.16.12 to adapt to many kinds of systems.
+\`configure' configures autoyast2 2.16.13 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1276,7 +1276,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of autoyast2 2.16.12:";;
+ short | recursive ) echo "Configuration of autoyast2 2.16.13:";;
esac
cat <<\_ACEOF
@@ -1354,7 +1354,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-autoyast2 configure 2.16.12
+autoyast2 configure 2.16.13
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1368,7 +1368,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by autoyast2 $as_me 2.16.12, which was
+It was created by autoyast2 $as_me 2.16.13, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2189,7 +2189,7 @@
# Define the identity of the package.
PACKAGE='autoyast2'
- VERSION='2.16.12'
+ VERSION='2.16.13'
cat >>confdefs.h <<_ACEOF
@@ -2416,7 +2416,7 @@
-VERSION="2.16.12"
+VERSION="2.16.13"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
@@ -3429,7 +3429,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by autoyast2 $as_me 2.16.12, which was
+This file was extended by autoyast2 $as_me 2.16.13, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3472,7 +3472,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-autoyast2 config.status 2.16.12
+autoyast2 config.status 2.16.13
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.12/configure.in new/autoyast2-2.16.13/configure.in
--- old/autoyast2-2.16.12/configure.in 2008-03-26 11:20:37.000000000 +0100
+++ new/autoyast2-2.16.13/configure.in 2008-04-03 12:53:57.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(autoyast2, 2.16.12, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 2.16.13, http://bugs.opensuse.org/, autoyast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.16.12"
+VERSION="2.16.13"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.12/doc/CreateProfileDetails.xml new/autoyast2-2.16.13/doc/CreateProfileDetails.xml
--- old/autoyast2-2.16.12/doc/CreateProfileDetails.xml 2008-02-01 13:14:13.000000000 +0100
+++ new/autoyast2-2.16.13/doc/CreateProfileDetails.xml 2008-03-27 15:11:41.000000000 +0100
@@ -27,13 +27,7 @@
<para>
General
options include all the settings related to the installation process and
- the environment of the installed system. Among
- others it includes the following 4 properties which are required:
- <emphasis>language</emphasis>,<emphasis> keyboard</emphasis>,<emphasis>
- clock</emphasis> and <emphasis>mouse</emphasis> almost for any
- installation. If left out, default values will be used, which might not
- be in one hand with what you want.
-
+ the environment of the installed system.
</para>
<example>
<title>General Options</title>
@@ -59,20 +53,11 @@
stage two, the machine is turned off. The bootloader is alreay installed
and all your chroot scripts have run.
</para>
- <note>
- <title>Change starting from SUSE Linux 9.1/SLES 9</title>
- <para>
- The <emphasis>reboot</emphasis> property in the <emphasis>mode</emphasis>
- resource was used to force a reboot after initial system setup and before
- the system is booted for the first time. Currently after initial installation
- all systems must boot, which makes this option obsolete.
- </para>
- </note>
- <note>
- <title>SLES9 Only Options</title>
- <para>In SLES 9, it is possible to halt the system after the initial
- installation phase using the boolean property <emphasis>halt</emphasis></para>
- </note>
+ <para>
+ <emphasis>final_halt</emphasis> and <emphasis>final_reboot</emphasis> are new
+ with openSUSE 11.0 and SLES11. You can reboot or halt the machine,
+ when everything with installation and configuration is done, with that.
+ </para>
<note>
<title>Change starting from SUSE Linux 10.1/SLES10</title>
<para>
@@ -1199,59 +1184,9 @@
Software
</title>
- <section id="Software.Selections">
- <title>
- Package Selections until SUSE Linux 10.1 (not SLES10)
- </title>
- <para>
- You can install software on the new system using a pre-defined package base selection, i.e. Minimal, Minimal+X11,
- default etc. in addition to several <emphasis>Add-on</emphasis> selections.
- Check the first CD for available selections in
- <filename>suse/setup/descr/selections</filename>, depending on the
- product you are installing, some "well-known" selections might not
- be available.
- </para>
-
-
- <para>
- In the control file, packages and package selections are described as
- the following:
- </para>
- <example>
- <title>
- Package selection in control file
- </title>
- <screen>
-http://www.w3.org/2001/XInclude"/>
- </screen>
- </example>
- <para>
- You can install one base selection and additionally one or multiple
- add-on selections.
- </para>
- <para>
- When installing from a CD-ROM, needed packages from other CD-ROMs
- are installed after the initial boot of the
- system in the second installation phase. If you
- are installing packages from multiple CD-ROMs, then
- auto-installation has to be interrupted for switching the
- CD-ROMs. In the case of NFS installation, all packages are
- installed at first stage of the installation only if the NFS repository
- is configured as a single medium.
- </para>
- <para>
- It is often required, that a package should be installed in the
- second phase, especially custom packages
- which may contain scripts for configuring the system. This can be
- done using the <emphasis>post-packages</emphasis> resource.
- </para>
-
- </section>
-
<section id="Software.Selections.sles10">
<title>
- Package Selections with patterns (SLES10 and SUSE Linux 10.2)
+ Package Selections with patterns
</title>
<para>
SLES10 no longer supports <emphasis>selections</emphasis> but uses
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.12/doc/CreateProfile.xml new/autoyast2-2.16.13/doc/CreateProfile.xml
--- old/autoyast2-2.16.12/doc/CreateProfile.xml 2007-05-21 12:26:33.000000000 +0200
+++ new/autoyast2-2.16.13/doc/CreateProfile.xml 2008-03-27 14:53:05.000000000 +0100
@@ -75,17 +75,6 @@
</section>
- <section>
- <title>Import of Legacy and Foreign Configuration Files</title>
-
- <para>
- &autoyast2; offers the option to import <abbrev>ALICE</abbrev> configuration files from
- previous SuSE releases and foreign auto-installation systems
- (Kickstart). Consult the chapter dealing with these issues in this
- manual.
- </para>
- </section>
-
</section>
<section id="CreateProfile.Manual">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.12/doc/examples/example.kernel.xml new/autoyast2-2.16.13/doc/examples/example.kernel.xml
--- old/autoyast2-2.16.12/doc/examples/example.kernel.xml 2007-05-21 12:26:33.000000000 +0200
+++ new/autoyast2-2.16.13/doc/examples/example.kernel.xml 2008-03-27 14:46:31.000000000 +0100
@@ -1,11 +1,7 @@
<software>
- <addons config:type="list">
- <addon>Kde</addon>
- </addons>
- <base>Minimal</base>
<kernel>kernel-default</kernel>
<packages config:type="list">
<package>apache2</package>
</packages>
- </software>
\ No newline at end of file
+ </software>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.12/doc/examples/example.removesoft.xml new/autoyast2-2.16.13/doc/examples/example.removesoft.xml
--- old/autoyast2-2.16.12/doc/examples/example.removesoft.xml 2007-05-21 12:26:33.000000000 +0200
+++ new/autoyast2-2.16.13/doc/examples/example.removesoft.xml 2008-03-27 14:46:50.000000000 +0100
@@ -1,8 +1,4 @@
<software>
- <addons config:type="list">
- <addon>Kde</addon>
- </addons>
- <base>Minimal</base>
<packages config:type="list">
<package>sendmail</package>
</packages>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.12/doc/examples/example.software.xml new/autoyast2-2.16.13/doc/examples/example.software.xml
--- old/autoyast2-2.16.12/doc/examples/example.software.xml 2007-05-21 12:26:32.000000000 +0200
+++ new/autoyast2-2.16.13/doc/examples/example.software.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-
- <software>
-
- <addons config:type="list">
- <addon>Kde</addon>
- </addons>
- <base>Minimal</base>
- <packages config:type="list">
- <package>apache</package>
- <package>sendmail</package>
- </packages>
- </software>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.12/doc/Profile.xml new/autoyast2-2.16.13/doc/Profile.xml
--- old/autoyast2-2.16.12/doc/Profile.xml 2007-05-21 12:26:33.000000000 +0200
+++ new/autoyast2-2.16.13/doc/Profile.xml 2008-03-27 14:39:56.000000000 +0100
@@ -126,65 +126,6 @@
elements. The permissible resource elements are specified in the
&dtd;.
</para>
- <para>
- The root element in the control file can for example contain the
- following sub-keywords:
- </para>
- <itemizedlist>
- <listitem>
- <para>
- installation (Tag <emphasis><install></emphasis> this tag is deprecated since SUSE Linux 10.0 )
- </para>
- <itemizedlist>
- <listitem>
- <para>
- Bootloader configuration: bootloader device, bootloader location (Tag <emphasis><bootloader></emphasis> )
- </para>
- </listitem>
- <listitem>
- <para>
- Partitioning: drives and partition plans (Tag <emphasis><partitioning></emphasis> )
- </para>
- </listitem>
- <listitem>
- <para>
- General: Installation instructions, including all variables related to
- the client i.e. display, languages, keyboard etc. (Tag <emphasis><general></emphasis> )
- </para>
- </listitem>
- <listitem>
- <para>
- Software: Software and Package selections (Tag <emphasis><software></emphasis> )
- </para>
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
- <para>
- configuration (Tag <emphasis><configure></emphasis> this tag is deprecated since SUSE Linux 10.0 )
- </para>
- <itemizedlist>
- <listitem>
- <para>
- Network: network configuration for the
- client and servers providing services to the target client (Tag <emphasis><networking></emphasis> )
- </para>
- </listitem>
- <listitem>
- <para>
- Users: user administration, including first user and root. (Tag <emphasis><users></emphasis> )
- </para>
- </listitem>
- <listitem>
- <para>
- User scripts: (Tag <emphasis><scripts></emphasis> )
- </para>
- </listitem>
-
-
- </itemizedlist>
- </listitem>
- </itemizedlist>
<section>
<title>
Resources and Properties
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.12/src/clients/autoyast.ycp new/autoyast2-2.16.13/src/clients/autoyast.ycp
--- old/autoyast2-2.16.12/src/clients/autoyast.ycp 2008-01-09 16:38:52.000000000 +0100
+++ new/autoyast2-2.16.13/src/clients/autoyast.ycp 2008-04-03 12:53:07.000000000 +0200
@@ -3,7 +3,7 @@
* Summary: Main file for client call
* Authors: Anas Nashif
*
- * $Id: autoyast.ycp 43502 2008-01-09 15:40:14Z ug $
+ * $Id: autoyast.ycp 45985 2008-04-02 14:46:40Z lslezak $
*/
{
textdomain "autoinst";
@@ -20,6 +20,7 @@
import "AddOnProduct";
import "CommandLine";
import "Y2ModuleConfig";
+ import "AutoInstall";
include "autoinstall/dialogs.ycp";
include "autoinstall/conftree.ycp";
@@ -34,10 +35,10 @@
return `abort;
}
- Pkg::CallbackImportGpgKey("AutoInstall::callbackTrue");
- Pkg::CallbackAcceptUnknownGpgKey("AutoInstall::callbackTrue");
- Pkg::CallbackAcceptFileWithoutChecksum("AutoInstall::callbackTrue");
- Pkg::CallbackAcceptUnsignedFile("AutoInstall::callbackTrue");
+ Pkg::CallbackImportGpgKey(AutoInstall::callbackTrue_boolean_map);
+ Pkg::CallbackAcceptUnknownGpgKey(AutoInstall::callbackTrue_boolean_string_string);
+ Pkg::CallbackAcceptFileWithoutChecksum(AutoInstall::callbackTrue_boolean_string);
+ Pkg::CallbackAcceptUnsignedFile(AutoInstall::callbackTrue_boolean_string);
define boolean openFile( map options ) {
if( !Profile::ReadXML( options["filename"]:"" ) ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.12/src/clients/software_auto.ycp new/autoyast2-2.16.13/src/clients/software_auto.ycp
--- old/autoyast2-2.16.12/src/clients/software_auto.ycp 2007-05-21 12:26:35.000000000 +0200
+++ new/autoyast2-2.16.13/src/clients/software_auto.ycp 2008-04-03 12:53:07.000000000 +0200
@@ -4,7 +4,7 @@
* Authors: Anas Nashif (nashif@suse.de)
* Summary: Handle Package selections and packages
*
- * $Id: software_auto.ycp 35155 2007-01-08 15:05:05Z ug $
+ * $Id: software_auto.ycp 45985 2008-04-02 14:46:40Z lslezak $
*/
{
@@ -17,6 +17,7 @@
import "AutoinstSoftware";
import "Label";
import "PackageAI";
+ import "AutoInstall";
include "autoinstall/dialogs.ycp";
@@ -51,8 +52,9 @@
</p>
");
//Pkg::TargetFinish ();
- Pkg::CallbackAcceptFileWithoutChecksum("AutoInstall::callbackTrue");
- Pkg::CallbackAcceptUnsignedFile("AutoInstall::callbackTrue");
+ Pkg::CallbackAcceptFileWithoutChecksum(AutoInstall::callbackTrue_boolean_string);
+ Pkg::CallbackAcceptUnsignedFile(AutoInstall::callbackTrue_boolean_string);
+
Pkg::TargetInit("/", false);
// AutoinstSoftware::pmInit();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.12/src/dialogs/general_dialogs.ycp new/autoyast2-2.16.13/src/dialogs/general_dialogs.ycp
--- old/autoyast2-2.16.12/src/dialogs/general_dialogs.ycp 2008-02-18 12:17:23.000000000 +0100
+++ new/autoyast2-2.16.13/src/dialogs/general_dialogs.ycp 2008-04-01 12:08:26.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: General Settings
* Author: Anas Nashif
*
- * $Id: general_dialogs.ycp 44396 2008-02-12 15:52:28Z msvec $
+ * $Id: general_dialogs.ycp 45910 2008-04-01 07:05:19Z jsrain $
*/
{
textdomain "autoinst";
@@ -303,7 +303,7 @@
`TextEntry( `id(`dialogTitle), _("Dialog Title"), title ),
`MultiLineEdit( `id( `help ), _("Helptext"), help ),
`HBox(
- `PushButton( `id( `addDialog ), `opt( `default, `hstretch ), _("Add to Dialoglist") ),
+ `PushButton( `id( `addDialog ), `opt( `default, `hstretch ), _("Add to Dialog List") ),
`PushButton( `id( `applyDialog ), `opt( `default, `hstretch ), _("Apply Changes to Dialog") )
),
`MinSize( 10,5,
@@ -313,9 +313,9 @@
dialogs
) ),
`HBox(
- `PushButton( `id( `deleteDialog ), `opt( `default, `hstretch ), _("delete Dialog") ),
- `PushButton( `id( `dialogUp ), `opt( `default, `hstretch ), _("Dialog up") ),
- `PushButton( `id( `dialogDown ), `opt( `default, `hstretch ), _("Dialog down") )
+ `PushButton( `id( `deleteDialog ), `opt( `default, `hstretch ), _("Delete Dialog") ),
+ `PushButton( `id( `dialogUp ), `opt( `default, `hstretch ), _("Dialog Up") ),
+ `PushButton( `id( `dialogDown ), `opt( `default, `hstretch ), _("Dialog Down") )
),
`Label( _("Questions in Dialog") ),
`MinSize( 10,5,
@@ -325,11 +325,11 @@
questions
) ),
`HBox(
- `PushButton( `id( `addQuestion ), `opt( `default, `hstretch ), _("add Question") ),
- `PushButton( `id( `editQuestion ), `opt( `default, `hstretch ), _("edit Question") ),
- `PushButton( `id( `deleteQuestion ), `opt( `default, `hstretch ), _("delete Question") ),
- `PushButton( `id( `questionUp ), `opt( `default, `hstretch ), _("Question up") ),
- `PushButton( `id( `questionDown ), `opt( `default, `hstretch ), _("Question down") )
+ `PushButton( `id( `addQuestion ), `opt( `default, `hstretch ), _("Add Question") ),
+ `PushButton( `id( `editQuestion ), `opt( `default, `hstretch ), _("Edit Question") ),
+ `PushButton( `id( `deleteQuestion ), `opt( `default, `hstretch ), _("Delete Question") ),
+ `PushButton( `id( `questionUp ), `opt( `default, `hstretch ), _("Question Up") ),
+ `PushButton( `id( `questionDown ), `opt( `default, `hstretch ), _("Question Down") )
)
)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.12/src/include/conftree.ycp new/autoyast2-2.16.13/src/include/conftree.ycp
--- old/autoyast2-2.16.12/src/include/conftree.ycp 2008-02-27 17:38:25.000000000 +0100
+++ new/autoyast2-2.16.13/src/include/conftree.ycp 2008-04-01 12:09:09.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: This module handles the configuration for auto-installation
* Authors: Anas Nashif
*
- * $Id: conftree.ycp 45089 2008-02-27 16:38:25Z ug $
+ * $Id: conftree.ycp 45925 2008-04-01 10:09:08Z ug $
*/
{
@@ -476,6 +476,8 @@
}
});
Popup::ClearFeedback();
+ Wizard::DeleteMenus(); // FIXME: sucks sucks sucks sucks sucks
+ menus();
} else {
/* opening/parsing the xml file failed */
Popup::Error(_("An error occured while opening/parsing the XML file."));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.12/src/include/io.ycp new/autoyast2-2.16.13/src/include/io.ycp
--- old/autoyast2-2.16.12/src/include/io.ycp 2007-11-13 14:41:56.000000000 +0100
+++ new/autoyast2-2.16.13/src/include/io.ycp 2008-03-27 11:10:17.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: I/O
* Authors: Anas Nashif
*
- * $Id: io.ycp 42018 2007-11-13 13:42:16Z ug $
+ * $Id: io.ycp 45780 2008-03-27 10:10:16Z ug $
*/
{
textdomain "autoinst";
@@ -213,7 +213,7 @@
y2milestone("looking for %1 on USB", Path);
list<map> probe = (list<map>)SCR::Read(.probe.usb);
foreach( map d, probe, ``{
- if( haskey(d, "dev_name") ) {
+ if( d["bus"]:"USB" == "SCSI" && haskey(d, "dev_name") ) {
integer i = 0;
string dev = d["dev_name"]:"";
while( SCR::Read(.target.lstat, dev) != $[] ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.12/src/modules/AutoInstall.ycp new/autoyast2-2.16.13/src/modules/AutoInstall.ycp
--- old/autoyast2-2.16.12/src/modules/AutoInstall.ycp 2007-11-26 17:44:58.000000000 +0100
+++ new/autoyast2-2.16.13/src/modules/AutoInstall.ycp 2008-04-03 12:53:08.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Auto-installation related functions module
* Author: Anas Nashif
*
- * $Id: AutoInstall.ycp 41911 2007-11-09 11:03:42Z ug $
+ * $Id: AutoInstall.ycp 45985 2008-04-02 14:46:40Z lslezak $
*/
{
module "AutoInstall";
@@ -20,11 +20,40 @@
global boolean autoconf = false;
- global define boolean callbackTrue() {
+ global define boolean callbackTrue_boolean_string(string dummy) {
return true;
}
- global define boolean callbackFalse() {
+ global define boolean callbackFalse_boolean_string(string dummy) {
+ return false;
+ }
+
+ global define void callback_void_map(map dummy_map) {
+ return;
+ }
+
+ global define boolean callbackTrue_boolean_map(map dummy_map) {
+ return true;
+ }
+
+ global define boolean callbackFalse_boolean_map(map dummy_map) {
+ return false;
+ }
+
+
+ global define boolean callbackTrue_boolean_string_map(string dummy, map dummy_map) {
+ return true;
+ }
+
+ global define boolean callbackFalse_boolean_string_map(string dummy, map dummy_map) {
+ return false;
+ }
+
+ global define boolean callbackTrue_boolean_string_string(string dummy1, string dummy2) {
+ return true;
+ }
+
+ global define boolean callbackFalse_boolean_string_string(string dummy1, string dummy2) {
return false;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.12/src/modules/AutoinstGeneral.ycp new/autoyast2-2.16.13/src/modules/AutoinstGeneral.ycp
--- old/autoyast2-2.16.12/src/modules/AutoinstGeneral.ycp 2007-11-27 11:57:51.000000000 +0100
+++ new/autoyast2-2.16.13/src/modules/AutoinstGeneral.ycp 2008-04-03 12:53:08.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Configuration of general settings for autoyast
* Authors: Anas Nashif (nashif@suse.de)
*
- * $Id: AutoinstGeneral.ycp 42424 2007-11-27 10:58:27Z ug $
+ * $Id: AutoinstGeneral.ycp 45985 2008-04-02 14:46:40Z lslezak $
*/
{
@@ -173,35 +173,35 @@
global define void SetSignatureHandling() {
if( haskey(signature_handling, "accept_unsigned_file" ) )
Pkg::CallbackAcceptUnsignedFile(
- signature_handling["accept_unsigned_file"]:false ? "AutoInstall::callbackTrue" : "AutoInstall::callbackFalse"
+ signature_handling["accept_unsigned_file"]:false ? AutoInstall::callbackTrue_boolean_string : AutoInstall::callbackFalse_boolean_string
);
if( haskey(signature_handling, "accept_file_without_checksum" ) )
Pkg::CallbackAcceptFileWithoutChecksum(
- signature_handling["accept_file_without_checksum"]:false ? "AutoInstall::callbackTrue" : "AutoInstall::callbackFalse"
+ signature_handling["accept_file_without_checksum"]:false ? AutoInstall::callbackTrue_boolean_string : AutoInstall::callbackFalse_boolean_string
);
if( haskey(signature_handling, "accept_verification_failed") )
Pkg::CallbackAcceptVerificationFailed(
- signature_handling["accept_verification_failed"]:false ? "AutoInstall::callbackTrue" : "AutoInstall::callbackFalse"
+ signature_handling["accept_verification_failed"]:false ? AutoInstall::callbackTrue_boolean_string_map : AutoInstall::callbackFalse_boolean_string_map
);
if( haskey(signature_handling, "trusted_key_added") )
- Pkg::CallbackTrustedKeyAdded(
- signature_handling["trusted_key_added"]:false ? "AutoInstall::callbackTrue" : "AutoInstall::callbackFalse"
+ Pkg::CallbackTrustedKeyAdded(
+ AutoInstall::callback_void_map
);
if( haskey(signature_handling, "trusted_key_removed") )
- Pkg::CallbackTrustedKeyRemoved(
- signature_handling["trusted_key_removed"]:false ? "AutoInstall::callbackTrue" : "AutoInstall::callbackFalse"
+ Pkg::CallbackTrustedKeyRemoved(
+ AutoInstall::callback_void_map
);
if( haskey(signature_handling, "accept_unknown_gpg_key") )
Pkg::CallbackAcceptUnknownGpgKey(
- signature_handling["accept_unknown_gpg_key"]:false ? "AutoInstall::callbackTrue" : "AutoInstall::callbackFalse"
+ signature_handling["accept_unknown_gpg_key"]:false ? AutoInstall::callbackTrue_boolean_string_string : AutoInstall::callbackFalse_boolean_string_string
);
if( haskey(signature_handling, "import_gpg_key") )
Pkg::CallbackImportGpgKey(
- signature_handling["import_gpg_key"]:false ? "AutoInstall::callbackTrue" : "AutoInstall::callbackFalse"
+ signature_handling["import_gpg_key"]:false ? AutoInstall::callbackTrue_boolean_map : AutoInstall::callbackFalse_boolean_map
);
if( haskey(signature_handling, "accept_non_trusted_gpg_key") )
Pkg::CallbackAcceptNonTrustedGpgKey(
- signature_handling["accept_non_trusted_gpg_key"]:false ? "AutoInstall::callbackTrue" : "AutoInstall::callbackFalse"
+ signature_handling["accept_non_trusted_gpg_key"]:false ? AutoInstall::callbackTrue_boolean_map : AutoInstall::callbackFalse_boolean_map
);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.12/src/modules/AutoinstLVM.ycp new/autoyast2-2.16.13/src/modules/AutoinstLVM.ycp
--- old/autoyast2-2.16.12/src/modules/AutoinstLVM.ycp 2007-11-22 14:41:12.000000000 +0100
+++ new/autoyast2-2.16.13/src/modules/AutoinstLVM.ycp 2008-04-01 12:08:27.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: LVM
* Authors: Anas Nashif
*
- * $Id: AutoinstLVM.ycp 42322 2007-11-22 13:41:42Z ug $
+ * $Id: AutoinstLVM.ycp 45910 2008-04-01 07:05:19Z jsrain $
*/
{
@@ -101,7 +101,7 @@
if( haskey( p, "lvm_group" ) && p["create"]:true == false ) {
keepLVM[p["lvm_group"]:"x"] = [];
if( !contains( ExistingVGs, p["lvm_group"]:"x" ) )
- Report::Error( sformat( _("can't reuse volume group %1. The volume group does not exist"), p["lvm_group"]:"x" ) );
+ Report::Error( sformat( _("Cannot reuse volume group %1. The volume group does not exist."), p["lvm_group"]:"x" ) );
map atm = AutoinstStorage::AutoTargetMap;
foreach ( map vg_p, atm["/dev/"+p["lvm_group"]:"x","partitions"]:[], ``{
if( vg_p["create"]:true == false )
@@ -110,7 +110,7 @@
} else if( haskey( p, "evms_group" ) && p["create"]:true == false ) {
keepEVMS[p["evms_group"]:"x"] = [];
if( !contains( ExistingVGs, p["evms_group"]:"x" ) )
- Report::Error( sformat( _("can't reuse volume group %1. The volume group does not exist"), p["evms_group"]:"x" ) );
+ Report::Error( sformat( _("Cannot reuse volume group %1. The volume group does not exist."), p["evms_group"]:"x" ) );
map atm = AutoinstStorage::AutoTargetMap;
foreach ( map vg_p, atm["/dev/"+p["evms_group"]:"x","partitions"]:[], ``{
if( vg_p["create"]:true == false )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.12/src/modules/AutoinstStorage.ycp new/autoyast2-2.16.13/src/modules/AutoinstStorage.ycp
--- old/autoyast2-2.16.12/src/modules/AutoinstStorage.ycp 2008-03-13 15:37:24.000000000 +0100
+++ new/autoyast2-2.16.13/src/modules/AutoinstStorage.ycp 2008-04-01 12:08:27.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Storage
* Authors: Anas Nashif
*
- * $Id: AutoinstStorage.ycp 45433 2008-03-13 14:37:24Z ug $
+ * $Id: AutoinstStorage.ycp 45910 2008-04-01 07:05:19Z jsrain $
*/
{
module "AutoinstStorage";
@@ -411,7 +411,7 @@
y2milestone("shrinking %1",pe);
s = s - ((usedSize - sizeByCyl)/cyl_size+1+size(d["partitions"]:[]))*cyl_size; // 1 cyl buffer per partition
if( s < 1 ) {
- Report::Error( sformat( _("The partition plan configured in your XML profile does not fit on the harddisk. %1MB missing"), (usedSize-sizeByCyl)/(1024*1024) ));
+ Report::Error( sformat( _("The partition plan configured in your XML profile does not fit on the hard disk. %1MB missing"), (usedSize-sizeByCyl)/(1024*1024) ));
break;
} else {
usedSize = usedSize - s;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.12/VERSION new/autoyast2-2.16.13/VERSION
--- old/autoyast2-2.16.12/VERSION 2008-03-26 11:19:18.000000000 +0100
+++ new/autoyast2-2.16.13/VERSION 2008-04-03 12:53:49.000000000 +0200
@@ -1 +1 @@
-2.16.12
+2.16.13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org