Hello community,
here is the log from the commit of package autoyast2
checked in at Thu Sep 25 23:27:18 CEST 2008.
--------
--- autoyast2/autoyast2.changes 2008-09-17 14:05:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2008-09-25 15:53:36.435691000 +0200
@@ -1,0 +2,27 @@
+Thu Sep 25 15:34:05 CEST 2008 - ug@suse.de
+
+- 2.17.13
+
+-------------------------------------------------------------------
+Thu Sep 25 15:18:52 CEST 2008 - lslezak@suse.cz
+
+- adapted the GPG callbacks to the new prototypes (bnc#370223)
+
+-------------------------------------------------------------------
+Wed Sep 24 15:41:39 CEST 2008 - ug@suse.de
+
+- Export() in storage code moved to fix bnc#429227
+
+-------------------------------------------------------------------
+Wed Sep 24 14:02:56 CEST 2008 - ug@suse.de
+
+- second try for a fix for partition size during cloning
+ (bnc#415005)
+
+-------------------------------------------------------------------
+Fri Sep 19 14:37:43 CEST 2008 - sschober@suse.de
+
+- Set Profile::changed when cloneing a module
+- Removed Cancel-button from exit dialog (bnc#427710).
+
+-------------------------------------------------------------------
Old:
----
autoyast2-2.17.12.tar.bz2
New:
----
autoyast2-2.17.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.c17681/_old 2008-09-25 23:26:53.000000000 +0200
+++ /var/tmp/diff_new_pack.c17681/_new 2008-09-25 23:26:53.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package autoyast2 (Version 2.17.12)
+# spec file for package autoyast2 (Version 2.17.13)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,12 +20,12 @@
Url: http://www.suse.de/~ug
Name: autoyast2
-Version: 2.17.12
+Version: 2.17.13
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: autoyast2-2.17.12.tar.bz2
+Source0: autoyast2-2.17.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)
@@ -61,7 +61,7 @@
%package installation
License: GPL v2 or later
-Version: 2.17.12
+Version: 2.17.13
Release: 1
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
@@ -83,7 +83,7 @@
Anas Nashif
%prep
-%setup -n autoyast2-2.17.12
+%setup -n autoyast2-2.17.13
%build
%{prefix}/bin/y2tool y2autoconf
@@ -235,6 +235,18 @@
%dir /var/lib/autoinstall
%dir /var/lib/autoinstall/autoconf
%changelog
+* Thu Sep 25 2008 ug@suse.de
+- 2.17.13
+* Thu Sep 25 2008 lslezak@suse.cz
+- adapted the GPG callbacks to the new prototypes (bnc#370223)
+* Wed Sep 24 2008 ug@suse.de
+- Export() in storage code moved to fix bnc#429227
+* Wed Sep 24 2008 ug@suse.de
+- second try for a fix for partition size during cloning
+ (bnc#415005)
+* Fri Sep 19 2008 sschober@suse.de
+- Set Profile::changed when cloneing a module
+- Removed Cancel-button from exit dialog (bnc#427710).
* Wed Sep 17 2008 ug@suse.de
- mountby could get lost while partition reuse
- ReadXML fixed
++++++ autoyast2-2.17.12.tar.bz2 -> autoyast2-2.17.13.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.12/configure new/autoyast2-2.17.13/configure
--- old/autoyast2-2.17.12/configure 2008-09-17 13:59:14.000000000 +0200
+++ new/autoyast2-2.17.13/configure 2008-09-25 15:34:34.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.17.12.
+# Generated by GNU Autoconf 2.61 for autoyast2 2.17.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.17.12'
-PACKAGE_STRING='autoyast2 2.17.12'
+PACKAGE_VERSION='2.17.13'
+PACKAGE_STRING='autoyast2 2.17.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.17.12 to adapt to many kinds of systems.
+\`configure' configures autoyast2 2.17.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.17.12:";;
+ short | recursive ) echo "Configuration of autoyast2 2.17.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.17.12
+autoyast2 configure 2.17.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.17.12, which was
+It was created by autoyast2 $as_me 2.17.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.17.12'
+ VERSION='2.17.13'
cat >>confdefs.h <<_ACEOF
@@ -2417,7 +2417,7 @@
-VERSION="2.17.12"
+VERSION="2.17.13"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
@@ -3430,7 +3430,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.17.12, which was
+This file was extended by autoyast2 $as_me 2.17.13, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3473,7 +3473,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-autoyast2 config.status 2.17.12
+autoyast2 config.status 2.17.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.17.12/configure.in new/autoyast2-2.17.13/configure.in
--- old/autoyast2-2.17.12/configure.in 2008-09-17 13:59:07.000000000 +0200
+++ new/autoyast2-2.17.13/configure.in 2008-09-25 15:34:30.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(autoyast2, 2.17.12, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 2.17.13, http://bugs.opensuse.org/, autoyast2)
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.17.12"
+VERSION="2.17.13"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.12/doc/CreateProfileDetails.xml new/autoyast2-2.17.13/doc/CreateProfileDetails.xml
--- old/autoyast2-2.17.12/doc/CreateProfileDetails.xml 2008-09-11 11:16:17.000000000 +0200
+++ new/autoyast2-2.17.13/doc/CreateProfileDetails.xml 2008-09-19 12:09:03.000000000 +0200
@@ -1292,11 +1292,11 @@
Deploying Images
</title>
<para>
- This feature is available since openSUSE 11.1 and SLES11.
+ This feature is available since openSUSE 11.1 but not in SLES11.
</para>
<para>
Since openSUSE 11.0 you can choose to use images during installation to speed up the installation.
- This is available in openSUSE 11.1 and SLES11 too. At then end, in the installed system, there is
+ This is available in openSUSE 11.1 too. At then end, in the installed system, there is
no difference visible if you did an image or a single RPM installation.
</para>
<example>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.12/src/clients/inst_autosetup.ycp new/autoyast2-2.17.13/src/clients/inst_autosetup.ycp
--- old/autoyast2-2.17.12/src/clients/inst_autosetup.ycp 2008-09-11 11:33:51.000000000 +0200
+++ new/autoyast2-2.17.13/src/clients/inst_autosetup.ycp 2008-09-23 11:07:25.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Anas Nashif
* Uwe Gansert
*
- * $Id: inst_autosetup.ycp 51014 2008-09-11 09:33:58Z ug $
+ * $Id: inst_autosetup.ycp 51392 2008-09-23 09:07:52Z ug $
*/
{
@@ -192,14 +192,16 @@
// No partitioning in the profile means yast2-storage proposal (hmmmm.....)
if( size(Profile::current["partitioning"]:[]) > 0 ) {
AutoinstStorage::Import(Profile::current["partitioning"]:[]);
+ } else if( size(Profile::current["partitioning_advanced"]:$[]) > 0 ) {
+ AutoinstStorage::ImportAdvanced(Profile::current["partitioning_advanced"]:$[]);
} else {
Storage::SetTestsuite(true); // FIXME: *urgs*
WFM::CallFunction("inst_disk_proposal", [true, true]); // FIXME: fragile?
Storage::SetTestsuite(false); // *urgs* again
}
- AutoinstStorage::ImportAdvanced(Profile::current["partitioning_advanced"]:$[]);
- if ( size(Profile::current["partitioning"]:[]) > 0 && !AutoinstStorage::Write())
+ if ( (size(Profile::current["partitioning"]:[]) > 0 || size(Profile::current["partitioning_advanced"]:$[]) > 0) &&
+ !AutoinstStorage::Write())
{
Report::Error(_("Error while configuring partitions.
Try again.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.12/src/include/conftree.ycp new/autoyast2-2.17.13/src/include/conftree.ycp
--- old/autoyast2-2.17.12/src/include/conftree.ycp 2008-09-05 11:36:18.000000000 +0200
+++ new/autoyast2-2.17.13/src/include/conftree.ycp 2008-09-22 11:54:16.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: This module handles the configuration for auto-installation
* Authors: Anas Nashif
*
- * $Id: conftree.ycp 50723 2008-09-05 09:36:11Z ug $
+ * $Id: conftree.ycp 51326 2008-09-19 13:27:47Z ug $
*/
{
@@ -275,6 +275,7 @@
Call::Function(auto , ["Read"]);
Call::Function(auto , ["SetModified"]);
Profile::prepare = true;
+ Profile::changed = true;
return true;
}
/**
@@ -680,31 +681,19 @@
current = AutoinstConfig::currentFile;
}
- symbol answer = Popup::AnyQuestion3(_("Control file changed."),
+ boolean answer = Popup::AnyQuestion(_("Control file changed."),
sformat(_("Save the changes to %1?"), current),
Label::YesButton(),
Label::NoButton(),
Label::CancelButton(),
`focus_yes
);
- if (answer == `no)
- {
- break;
- }
- else if (answer == `yes)
+ if (true == answer)
{
SaveAs();
- break;
}
- else
- {
- continue;
- }
- }
- else
- {
- break;
}
+ break;
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.12/src/modules/AutoInstall.ycp new/autoyast2-2.17.13/src/modules/AutoInstall.ycp
--- old/autoyast2-2.17.12/src/modules/AutoInstall.ycp 2008-04-03 12:53:08.000000000 +0200
+++ new/autoyast2-2.17.13/src/modules/AutoInstall.ycp 2008-09-25 15:29:31.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Auto-installation related functions module
* Author: Anas Nashif
*
- * $Id: AutoInstall.ycp 45985 2008-04-02 14:46:40Z lslezak $
+ * $Id: AutoInstall.ycp 51519 2008-09-25 13:20:00Z lslezak $
*/
{
module "AutoInstall";
@@ -28,6 +28,14 @@
return false;
}
+ global define boolean callbackTrue_boolean_string_integer(string dummy, integer dummy2) {
+ return true;
+ }
+
+ global define boolean callbackFalse_boolean_string_integer(string dummy, integer dummy2) {
+ return false;
+ }
+
global define void callback_void_map(map dummy_map) {
return;
}
@@ -40,12 +48,19 @@
return false;
}
+ global define boolean callbackTrue_boolean_map_integer(map dummy_map, integer dummy) {
+ return true;
+ }
+
+ global define boolean callbackFalse_boolean_map_integer(map dummy_map, integer dummy) {
+ return false;
+ }
- global define boolean callbackTrue_boolean_string_map(string dummy, map dummy_map) {
+ global define boolean callbackTrue_boolean_string_map_integer(string dummy, map dummy_map, integer dummy_int) {
return true;
}
- global define boolean callbackFalse_boolean_string_map(string dummy, map dummy_map) {
+ global define boolean callbackFalse_boolean_string_map_integer(string dummy, map dummy_map, integer dummy_int) {
return false;
}
@@ -57,6 +72,13 @@
return false;
}
+ global define boolean callbackTrue_boolean_string_string_integer(string dummy1, string dummy2, integer dummy3) {
+ return true;
+ }
+
+ global define boolean callbackFalse_boolean_string_string_integer(string dummy1, string dummy2, integer dummy3) {
+ return false;
+ }
/**
* Read saved data in continue mode
* @return boolean true on success
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.12/src/modules/AutoinstGeneral.ycp new/autoyast2-2.17.13/src/modules/AutoinstGeneral.ycp
--- old/autoyast2-2.17.12/src/modules/AutoinstGeneral.ycp 2008-06-25 16:23:05.000000000 +0200
+++ new/autoyast2-2.17.13/src/modules/AutoinstGeneral.ycp 2008-09-25 15:29:31.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Configuration of general settings for autoyast
* Authors: Anas Nashif (nashif@suse.de)
*
- * $Id: AutoinstGeneral.ycp 48533 2008-06-25 14:23:37Z ug $
+ * $Id: AutoinstGeneral.ycp 51519 2008-09-25 13:20:00Z lslezak $
*/
{
@@ -184,7 +184,7 @@
global define void SetSignatureHandling() {
if( haskey(signature_handling, "accept_unsigned_file" ) )
Pkg::CallbackAcceptUnsignedFile(
- signature_handling["accept_unsigned_file"]:false ? AutoInstall::callbackTrue_boolean_string : AutoInstall::callbackFalse_boolean_string
+ signature_handling["accept_unsigned_file"]:false ? AutoInstall::callbackTrue_boolean_string_integer : AutoInstall::callbackFalse_boolean_string_integer
);
if( haskey(signature_handling, "accept_file_without_checksum" ) )
Pkg::CallbackAcceptFileWithoutChecksum(
@@ -192,7 +192,7 @@
);
if( haskey(signature_handling, "accept_verification_failed") )
Pkg::CallbackAcceptVerificationFailed(
- signature_handling["accept_verification_failed"]:false ? AutoInstall::callbackTrue_boolean_string_map : AutoInstall::callbackFalse_boolean_string_map
+ signature_handling["accept_verification_failed"]:false ? AutoInstall::callbackTrue_boolean_string_map_integer : AutoInstall::callbackFalse_boolean_string_map_integer
);
if( haskey(signature_handling, "trusted_key_added") )
Pkg::CallbackTrustedKeyAdded(
@@ -204,11 +204,11 @@
);
if( haskey(signature_handling, "accept_unknown_gpg_key") )
Pkg::CallbackAcceptUnknownGpgKey(
- signature_handling["accept_unknown_gpg_key"]:false ? AutoInstall::callbackTrue_boolean_string_string : AutoInstall::callbackFalse_boolean_string_string
+ signature_handling["accept_unknown_gpg_key"]:false ? AutoInstall::callbackTrue_boolean_string_string_integer : AutoInstall::callbackFalse_boolean_string_string_integer
);
if( haskey(signature_handling, "import_gpg_key") )
Pkg::CallbackImportGpgKey(
- signature_handling["import_gpg_key"]:false ? AutoInstall::callbackTrue_boolean_map : AutoInstall::callbackFalse_boolean_map
+ signature_handling["import_gpg_key"]:false ? AutoInstall::callbackTrue_boolean_map_integer : AutoInstall::callbackFalse_boolean_map_integer
);
if( haskey(signature_handling, "accept_non_trusted_gpg_key") )
Pkg::CallbackAcceptNonTrustedGpgKey(
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.12/src/modules/AutoinstPartPlan.ycp new/autoyast2-2.17.13/src/modules/AutoinstPartPlan.ycp
--- old/autoyast2-2.17.12/src/modules/AutoinstPartPlan.ycp 2008-09-10 17:17:23.000000000 +0200
+++ new/autoyast2-2.17.13/src/modules/AutoinstPartPlan.ycp 2008-09-24 15:38:31.000000000 +0200
@@ -416,9 +416,10 @@
// I don't see any benefit in cloning that strict.
//new_pe["region"] = pe["region"]:[];
// new_pe["size"] = sformat("%1", pe["size_k"]:0*1024);
- new_pe["size"] = sformat("%1", pe["size_k"]:0*1024-cyl_size); // one cylinder buffer for #262535
- if( new_pe["size"]:0 < cyl_size ) // bnc#415005
- new_pe["size"] = cyl_size;
+ if( (pe["size_k"]:0*1024-cyl_size) < cyl_size ) // bnc#415005
+ new_pe["size"] = sformat("%1",cyl_size);
+ else
+ new_pe["size"] = sformat("%1", pe["size_k"]:0*1024-cyl_size); // one cylinder buffer for #262535
}
if (haskey(pe,"label")) {
new_pe["label"] = pe["label"]:"";
@@ -612,7 +613,29 @@
list<map> drives = maplist( DriveT drive, AutoPartPlan, {
return AutoinstDrive::Export( drive );
});
- return drives;
+
+ list<map> clean_drives = maplist(map d, drives, ``{
+ list p = maplist(map part, d["partitions"]:[] , ``{
+ if (haskey(part, "fsid"))
+ {
+ part = remove(part, "fsid");
+ }
+ if (haskey(part, "used_fs")) {
+ part = remove(part, "used_fs");
+ }
+ return part;
+ });
+ d["partitions"] = p;
+ // this is to delete the dummy "auto" filled in by UI
+ if( haskey(d,"device") && d["device"]:"" == "auto" ) {
+ d = remove(d, "device");
+ y2milestone("device 'auto' dropped");
+
+ }
+ return d;
+ });
+
+ return clean_drives;
}
global define void Reset(){
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.12/src/modules/AutoinstStorage.ycp new/autoyast2-2.17.13/src/modules/AutoinstStorage.ycp
--- old/autoyast2-2.17.12/src/modules/AutoinstStorage.ycp 2008-09-01 11:58:22.000000000 +0200
+++ new/autoyast2-2.17.13/src/modules/AutoinstStorage.ycp 2008-09-24 15:43:38.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Storage
* Authors: Anas Nashif
*
- * $Id: AutoinstStorage.ycp 50511 2008-09-01 09:59:31Z ug $
+ * $Id: AutoinstStorage.ycp 51469 2008-09-24 13:44:10Z ug $
*/
{
module "AutoinstStorage";
@@ -244,38 +244,6 @@
}
/**
- * Dump the settings to a map, for autoinstallation use.
- * @return list
- */
- global define list<map> Export()
- {
- y2milestone("entering Export");
- list<map> clean_drives = maplist(map d, AutoPartPlan, ``{
- list p = maplist(map part, d["partitions"]:[] , ``{
- if (haskey(part, "fsid"))
- {
- part = remove(part, "fsid");
- }
- if (haskey(part, "used_fs")) {
- part = remove(part, "used_fs");
- }
- return part;
- });
- d["partitions"] = p;
-
- // this is to delete the dummy "auto" filled in by UI
- if( haskey(d,"device") && d["device"]:"" == "auto" ) {
- d = remove(d, "device");
- y2debug("device 'auto' dropped");
-
- }
- return d;
- });
-
- return clean_drives;
- }
-
- /**
* if mountby is used, we will search for the matching
* partition here.
* @return list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.12/VERSION new/autoyast2-2.17.13/VERSION
--- old/autoyast2-2.17.12/VERSION 2008-09-17 13:58:39.000000000 +0200
+++ new/autoyast2-2.17.13/VERSION 2008-09-25 15:34:19.000000000 +0200
@@ -1 +1 @@
-2.17.12
+2.17.13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org