Hello community,
here is the log from the commit of package autoyast2
checked in at Fri Feb 16 07:02:55 CET 2007.
--------
--- autoyast2/autoyast2.changes 2007-01-31 15:46:03.000000000 +0100
+++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2007-02-15 14:22:35.515111000 +0100
@@ -1,0 +2,59 @@
+Thu Feb 15 14:04:16 CET 2007 - ug@suse.de
+
+- 2.15.3
+
+-------------------------------------------------------------------
+Wed Feb 14 17:39:23 CET 2007 - ug@suse.de
+
+- use the partition_id configured in the profile when
+ reusing partitions
+
+-------------------------------------------------------------------
+Wed Feb 14 15:04:05 CET 2007 - ug@suse.de
+
+- shrinking code fixed and warning added if partitions
+ don't fit on disk (#245072)
+
+-------------------------------------------------------------------
+Wed Feb 14 10:10:32 CET 2007 - ug@suse.de
+
+- some more "close window" does not work
+ (#240631)
+
+-------------------------------------------------------------------
+Mon Feb 12 11:06:35 CET 2007 - ug@suse.de
+
+- accept_non_trusted_gpg_key parameter added
+ to signature handling (#242087)
+
+-------------------------------------------------------------------
+Thu Feb 8 17:06:14 CET 2007 - ug@suse.de
+
+- don't clone extended partitions of partition type 5
+ (#243063)
+
+-------------------------------------------------------------------
+Fri Feb 2 12:20:19 CET 2007 - ug@suse.de
+
+- range oprator for rules fixed to include the borders
+ of the range
+
+-------------------------------------------------------------------
+Fri Feb 2 11:04:57 CET 2007 - ug@suse.de
+
+- popup added when the resolver run fails
+
+-------------------------------------------------------------------
+Thu Feb 1 16:32:55 CET 2007 - ug@suse.de
+
+- packages that are required by yast modules and
+ which are already installed, don't get installed again
+
+-------------------------------------------------------------------
+Thu Feb 1 09:55:41 CET 2007 - ug@suse.de
+
+- some more "close window" was not catched situations
+ fixed (#240631)
+- 2.15.2
+
+-------------------------------------------------------------------
Old:
----
autoyast2-2.15.1.tar.bz2
New:
----
autoyast2-2.15.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.Y22891/_old 2007-02-16 07:00:59.000000000 +0100
+++ /var/tmp/diff_new_pack.Y22891/_new 2007-02-16 07:00:59.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package autoyast2 (Version 2.15.1)
+# spec file for package autoyast2 (Version 2.15.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: autoyast2
URL: http://www.suse.de/~ug
-Version: 2.15.1
+Version: 2.15.3
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: autoyast2-2.15.1.tar.bz2
+Source0: autoyast2-2.15.3.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets fop java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-devtools yast2-mouse yast2-testsuite yast2-transfer yast2-update
Requires: yast2-core yast2-xml libxslt
@@ -49,7 +49,7 @@
Anas Nashif
%package installation
-Version: 2.15.1
+Version: 2.15.3
Release: 1
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
@@ -70,7 +70,7 @@
Anas Nashif
%prep
-%setup -n autoyast2-2.15.1
+%setup -n autoyast2-2.15.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -211,6 +211,35 @@
%dir /var/lib/autoinstall/autoconf
%changelog -n autoyast2
+* Thu Feb 15 2007 - ug@suse.de
+- 2.15.3
+* Wed Feb 14 2007 - ug@suse.de
+- use the partition_id configured in the profile when
+ reusing partitions
+* Wed Feb 14 2007 - ug@suse.de
+- shrinking code fixed and warning added if partitions
+ don't fit on disk (#245072)
+* Wed Feb 14 2007 - ug@suse.de
+- some more "close window" does not work
+ (#240631)
+* Mon Feb 12 2007 - ug@suse.de
+- accept_non_trusted_gpg_key parameter added
+ to signature handling (#242087)
+* Thu Feb 08 2007 - ug@suse.de
+- don't clone extended partitions of partition type 5
+ (#243063)
+* Fri Feb 02 2007 - ug@suse.de
+- range oprator for rules fixed to include the borders
+ of the range
+* Fri Feb 02 2007 - ug@suse.de
+- popup added when the resolver run fails
+* Thu Feb 01 2007 - ug@suse.de
+- packages that are required by yast modules and
+ which are already installed, don't get installed again
+* Thu Feb 01 2007 - ug@suse.de
+- some more "close window" was not catched situations
+ fixed (#240631)
+- 2.15.2
* Wed Jan 31 2007 - ug@suse.de
- 2.15.1
* Wed Jan 31 2007 - ug@suse.de
++++++ autoyast2-2.15.1.tar.bz2 -> autoyast2-2.15.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.15.1/configure new/autoyast2-2.15.3/configure
--- old/autoyast2-2.15.1/configure 2007-01-31 15:31:17.000000000 +0100
+++ new/autoyast2-2.15.3/configure 2007-02-15 14:04:47.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for autoyast2 2.15.1.
+# Generated by GNU Autoconf 2.60 for autoyast2 2.15.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='autoyast2'
PACKAGE_TARNAME='autoyast2'
-PACKAGE_VERSION='2.15.1'
-PACKAGE_STRING='autoyast2 2.15.1'
+PACKAGE_VERSION='2.15.3'
+PACKAGE_STRING='autoyast2 2.15.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1189,7 +1189,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.15.1 to adapt to many kinds of systems.
+\`configure' configures autoyast2 2.15.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1260,7 +1260,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of autoyast2 2.15.1:";;
+ short | recursive ) echo "Configuration of autoyast2 2.15.3:";;
esac
cat <<\_ACEOF
@@ -1338,7 +1338,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-autoyast2 configure 2.15.1
+autoyast2 configure 2.15.3
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1352,7 +1352,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.15.1, which was
+It was created by autoyast2 $as_me 2.15.3, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2153,7 +2153,7 @@
# Define the identity of the package.
PACKAGE='autoyast2'
- VERSION='2.15.1'
+ VERSION='2.15.3'
cat >>confdefs.h <<_ACEOF
@@ -2380,7 +2380,7 @@
-VERSION="2.15.1"
+VERSION="2.15.3"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
@@ -3386,7 +3386,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.15.1, which was
+This file was extended by autoyast2 $as_me 2.15.3, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3429,7 +3429,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-autoyast2 config.status 2.15.1
+autoyast2 config.status 2.15.3
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.15.1/configure.in new/autoyast2-2.15.3/configure.in
--- old/autoyast2-2.15.1/configure.in 2007-01-31 15:31:12.000000000 +0100
+++ new/autoyast2-2.15.3/configure.in 2007-02-15 14:04:40.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(autoyast2, 2.15.1, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 2.15.3, 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.15.1"
+VERSION="2.15.3"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.15.1/doc/CreateProfileDetails.xml new/autoyast2-2.15.3/doc/CreateProfileDetails.xml
--- old/autoyast2-2.15.1/doc/CreateProfileDetails.xml 2006-10-17 12:06:41.000000000 +0200
+++ new/autoyast2-2.15.3/doc/CreateProfileDetails.xml 2007-02-12 11:05:05.000000000 +0100
@@ -1508,6 +1508,13 @@
<entry>optional. If left out, autoyast lets yast decide what to do</entry>
</row>
<row>
+ <entry>accept_non_trusted_gpg_key</entry>
+ <entry>This basically means, we know the key, but it is not trusted
+ <para><screen><accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key></screen></para>
+ </entry>
+ <entry>optional. If left out, autoyast lets yast decide what to do</entry>
+ </row>
+ <row>
<entry>import_gpg_key</entry>
<entry>the installer will accept and import new gpg keys on the installation source in it's database.
<para><screen><import_gpg_key config:type="boolean">true</import_gpg_key></screen></para>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.15.1/doc/examples/example.generalOptions.xml new/autoyast2-2.15.3/doc/examples/example.generalOptions.xml
--- old/autoyast2-2.15.1/doc/examples/example.generalOptions.xml 2006-09-08 11:57:19.000000000 +0200
+++ new/autoyast2-2.15.3/doc/examples/example.generalOptions.xml 2007-02-12 11:06:04.000000000 +0100
@@ -7,6 +7,7 @@
true
true
true
+ true
</signature-handling>
<mode>
<halt config:type="boolean">false</halt>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.15.1/src/clients/files_auto.ycp new/autoyast2-2.15.3/src/clients/files_auto.ycp
--- old/autoyast2-2.15.1/src/clients/files_auto.ycp 2005-04-18 11:47:19.000000000 +0200
+++ new/autoyast2-2.15.3/src/clients/files_auto.ycp 2007-02-01 09:56:44.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Client for autoinstallation
* Authors: Anas Nashif
*
- * $Id: files_auto.ycp 21874 2005-02-23 14:45:45Z nashif $
+ * $Id: files_auto.ycp 35752 2007-02-01 08:56:40Z ug $
*
* This is a client for autoinstallation. It takes its arguments,
* goes through the configuration and return the setting.
@@ -177,7 +177,7 @@
}
}
- } until (ret == `next || ret == `back );
+ } until (ret == `next || ret == `back || ret == `cancel );
Wizard::SetNextButton(`next, Label::FinishButton() );
return (symbol) ret;
}
@@ -268,7 +268,7 @@
dialog_contents(), help, true, true);
- } until (ret == `back || ret == `next );
+ } until (ret == `back || ret == `next || ret == `cancel );
return (symbol) ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.15.1/src/clients/inst_autopost.ycp new/autoyast2-2.15.3/src/clients/inst_autopost.ycp
--- old/autoyast2-2.15.1/src/clients/inst_autopost.ycp 2006-09-18 14:59:41.000000000 +0200
+++ new/autoyast2-2.15.3/src/clients/inst_autopost.ycp 2007-02-01 16:34:00.000000000 +0100
@@ -5,7 +5,7 @@
* Summary: This module finishes auto-installation and configures
* the system as described in the profile file.
*
- * $Id: inst_autopost.ycp 32929 2006-09-18 13:01:18Z ug $
+ * $Id: inst_autopost.ycp 35804 2007-02-01 15:33:58Z ug $
*/
{
@@ -19,6 +19,7 @@
import "AutoinstScripts";
import "Report";
import "Progress";
+ import "PackageSystem";
include "autoinstall/ask.ycp";
y2debug("Profile=%1", Profile::current );
@@ -161,6 +162,9 @@
// Add all found packages
Progress::NextStep();
Progress::Title(_("Adding found packages..."));
+ packages = filter( string p, packages, {
+ return !PackageSystem::Installed(p);
+ });
AutoinstSoftware::addPostPackages(packages);
// Run early network scripts
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.15.1/src/clients/report_auto.ycp new/autoyast2-2.15.3/src/clients/report_auto.ycp
--- old/autoyast2-2.15.1/src/clients/report_auto.ycp 2005-02-08 18:27:10.000000000 +0100
+++ new/autoyast2-2.15.3/src/clients/report_auto.ycp 2007-02-14 10:11:26.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Report
* Authors: Anas Nashif
*
- * $Id: report_auto.ycp 19969 2004-10-27 02:01:08Z nashif $
+ * $Id: report_auto.ycp 36119 2007-02-14 09:11:24Z ug $
*/
{
textdomain "autoinst";
@@ -115,7 +115,7 @@
war["log"] = (boolean)UI::QueryWidget(`id(`warlog), `Value);
war["timeout"] = (integer)UI::QueryWidget(`id(`wartime), `Value);
}
- } until (ret == `next || ret == `back);
+ } until (ret == `cancel || ret == `next || ret == `back);
Report::Import($["messages":msg, "errors":err, "warnings":war]);
return (symbol)ret;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.15.1/src/dialogs/general_dialogs.ycp new/autoyast2-2.15.3/src/dialogs/general_dialogs.ycp
--- old/autoyast2-2.15.1/src/dialogs/general_dialogs.ycp 2007-01-31 14:43:41.000000000 +0100
+++ new/autoyast2-2.15.3/src/dialogs/general_dialogs.ycp 2007-02-12 11:07:17.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: General Settings
* Author: Anas Nashif
*
- * $Id: general_dialogs.ycp 35735 2007-01-31 13:43:36Z ug $
+ * $Id: general_dialogs.ycp 36025 2007-02-12 10:07:13Z ug $
*/
{
textdomain "autoinst";
@@ -42,6 +42,7 @@
boolean accept_verification_failed = signature_handling["accept_verification_failed"]:false;
boolean accept_unknown_gpg_key = signature_handling["accept_unknown_gpg_key"]:false;
boolean import_gpg_key = signature_handling["import_gpg_key"]:false;
+ boolean accept_non_trusted_gpg_key = signature_handling["accept_non_trusted_gpg_key"]:false;
term contents =
`HVSquash(
@@ -54,6 +55,7 @@
`Left(`CheckBox(`id(`accept_file_without_checksum), _("Accept Files without a &Checksum"), accept_file_without_checksum)),
`Left(`CheckBox(`id(`accept_verification_failed), _("Accept Failed &Verifications"), accept_verification_failed)),
`Left(`CheckBox(`id(`accept_unknown_gpg_key), _("Accept Unknown &GPG Keys"), accept_unknown_gpg_key)),
+ `Left(`CheckBox(`id(`accept_non_trusted_gpg_key), "Accept Non Trusted GPG Keys", accept_non_trusted_gpg_key)),
`Left(`CheckBox(`id(`import_gpg_key), _("Import &New GPG Keys"),import_gpg_key))
)
);
@@ -108,6 +110,7 @@
signature_handling["accept_verification_failed"] = (boolean)UI::QueryWidget(`id(`accept_verification_failed), `Value);
signature_handling["accept_unknown_gpg_key"] = (boolean)UI::QueryWidget(`id(`accept_unknown_gpg_key), `Value);
signature_handling["import_gpg_key"] = (boolean)UI::QueryWidget(`id(`import_gpg_key), `Value);
+ signature_handling["accept_non_trusted_gpg_key"] = (boolean)UI::QueryWidget(`id(`accept_non_trusted_gpg_key), `Value);
AutoinstGeneral::signature_handling = signature_handling;
}
} until (ret == `next || ret == `back || ret == `cancel );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.15.1/src/dialogs/script_dialogs.ycp new/autoyast2-2.15.3/src/dialogs/script_dialogs.ycp
--- old/autoyast2-2.15.1/src/dialogs/script_dialogs.ycp 2006-03-09 15:48:57.000000000 +0100
+++ new/autoyast2-2.15.3/src/dialogs/script_dialogs.ycp 2007-02-01 09:56:44.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Anas Nashif
*
- * $Id: script_dialogs.ycp 28773 2006-03-09 14:48:53Z ug $
+ * $Id: script_dialogs.ycp 35752 2007-02-01 08:56:40Z ug $
*/
{
@@ -340,7 +340,7 @@
script_dialog_contents(), help, true, true);
- } until (ret == `next || ret == `back );
+ } until (ret == `next || ret == `back || ret == `cancel );
return (symbol) ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.15.1/src/include/autopart.ycp new/autoyast2-2.15.3/src/include/autopart.ycp
--- old/autoyast2-2.15.1/src/include/autopart.ycp 2006-10-13 16:22:47.000000000 +0200
+++ new/autoyast2-2.15.3/src/include/autopart.ycp 2007-02-14 17:39:52.000000000 +0100
@@ -1,7 +1,7 @@
/*
-$Id: autopart.ycp 33409 2006-10-13 14:22:46Z ug $
+$Id: autopart.ycp 36151 2007-02-14 16:39:50Z ug $
*/
{
textdomain "autoinst";
@@ -413,9 +413,9 @@
{
fsid = Partitions::fsid_swap;
}
- if( solution["partitions",pindex,"id"]:0 != 0 )
+ if( solution["partitions",pindex,"fsid"]:0 != 0 )
{
- fsid = solution["partitions",pindex,"id"]:0;
+ fsid = solution["partitions",pindex,"fsid"]:0;
}
foreach( map p, disk["partitions"]:[],
``{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.15.1/src/modules/AutoInstallRules.ycp new/autoyast2-2.15.3/src/modules/AutoInstallRules.ycp
--- old/autoyast2-2.15.1/src/modules/AutoInstallRules.ycp 2006-03-22 15:48:52.000000000 +0100
+++ new/autoyast2-2.15.3/src/modules/AutoInstallRules.ycp 2007-02-02 12:20:56.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Process Auto-Installation Rules
* Author: Anas Nashif
*
- * $Id: AutoInstallRules.ycp 29265 2006-03-22 14:48:47Z ug $
+ * $Id: AutoInstallRules.ycp 35825 2007-02-02 11:20:54Z ug $
*/
{
@@ -355,7 +355,7 @@
{
list<string> range =splitstring(tostring(val), "-");
y2debug("Range: %1", range);
- tmpshell = tmpshell + sformat(" \"$%1\" -gt \"%2\" -a \"$%1\" -lt \"%3\" ", var, range[0]:"0", range[1]:"0");
+ tmpshell = tmpshell + sformat(" \"$%1\" -ge \"%2\" -a \"$%1\" -le \"%3\" ", var, range[0]:"0", range[1]:"0");
}
else if( matchtype == "regex" )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.15.1/src/modules/AutoinstClone.ycp new/autoyast2-2.15.3/src/modules/AutoinstClone.ycp
--- old/autoyast2-2.15.1/src/modules/AutoinstClone.ycp 2007-01-29 15:06:57.000000000 +0100
+++ new/autoyast2-2.15.3/src/modules/AutoinstClone.ycp 2007-02-08 17:07:17.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Anas Nashif
*
- * $Id: AutoinstClone.ycp 35681 2007-01-29 14:06:56Z ug $
+ * $Id: AutoinstClone.ycp 35975 2007-02-08 16:07:15Z ug $
*
*
*/
@@ -122,6 +122,8 @@
list<integer> usepartitions = [];
boolean no_create = false;
foreach(map pe, v["partitions"]:[], ``{
+ if( pe["type"]:`x == `extended )
+ continue;
map new_pe = $[];
boolean skipwin = false;
if (haskey(pe,"enc_type")) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.15.1/src/modules/AutoinstGeneral.ycp new/autoyast2-2.15.3/src/modules/AutoinstGeneral.ycp
--- old/autoyast2-2.15.1/src/modules/AutoinstGeneral.ycp 2006-10-10 10:03:35.000000000 +0200
+++ new/autoyast2-2.15.3/src/modules/AutoinstGeneral.ycp 2007-02-12 11:07:17.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Configuration of general settings for autoyast
* Authors: Anas Nashif (nashif@suse.de)
*
- * $Id: AutoinstGeneral.ycp 33295 2006-10-10 08:03:34Z ug $
+ * $Id: AutoinstGeneral.ycp 36025 2007-02-12 10:07:13Z ug $
*/
{
@@ -207,7 +207,10 @@
Pkg::CallbackImportGpgKey(
signature_handling["import_gpg_key"]:false ? "AutoInstall::callbackTrue" : "AutoInstall::callbackFalse"
);
-
+ if( haskey(signature_handling, "accept_non_trusted_gpg_key") )
+ Pkg::CallbackAcceptNonTrustedGpgKey(
+ signature_handling["accept_non_trusted_gpg_key"]:false ? "AutoInstall::callbackTrue" : "AutoInstall::callbackFalse"
+ );
}
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.15.1/src/modules/AutoinstSoftware.ycp new/autoyast2-2.15.3/src/modules/AutoinstSoftware.ycp
--- old/autoyast2-2.15.1/src/modules/AutoinstSoftware.ycp 2006-11-06 12:37:21.000000000 +0100
+++ new/autoyast2-2.15.3/src/modules/AutoinstSoftware.ycp 2007-02-02 11:05:33.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Software
* Authors: Anas Nashif
*
- * $Id: AutoinstSoftware.ycp 34071 2006-11-06 11:37:19Z ug $
+ * $Id: AutoinstSoftware.ycp 35822 2007-02-02 10:05:27Z ug $
*
*/
{
@@ -400,7 +400,9 @@
//
// Solve dependencies
//
- Pkg::PkgSolve(false);
+ if( !Pkg::PkgSolve(false) ) {
+ Report::Error( _("The package resolver run failed. Please check your software section in the autoyast profile.") );
+ }
SpaceCalculation::ShowPartitionWarning();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.15.1/src/modules/AutoinstStorage.ycp new/autoyast2-2.15.3/src/modules/AutoinstStorage.ycp
--- old/autoyast2-2.15.1/src/modules/AutoinstStorage.ycp 2007-01-16 16:17:01.000000000 +0100
+++ new/autoyast2-2.15.3/src/modules/AutoinstStorage.ycp 2007-02-14 15:04:40.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Storage
* Authors: Anas Nashif
*
- * $Id: AutoinstStorage.ycp 35398 2007-01-16 15:16:58Z ug $
+ * $Id: AutoinstStorage.ycp 36141 2007-02-14 14:04:39Z ug $
*/
{
module "AutoinstStorage";
@@ -18,6 +18,7 @@
import "Storage";
import "Partitions";
import "Popup";
+ import "Report";
include "partitioning/partition_defines.ycp";
@@ -402,10 +403,15 @@
integer s = pe["size"]:0;
if( s == max ) {
y2milestone("shrinking %1",pe);
- s = s - ((usedSize - sizeByCyl)/cyl_size+2)*cyl_size; // FIXME: why 2? 1 should be enough
- usedSize = usedSize - s;
- y2milestone("shrinking to %1",s);
- pe["size"] = s;
+ 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) ));
+ break;
+ } else {
+ usedSize = usedSize - s;
+ y2milestone("shrinking to %1",s);
+ pe["size"] = s;
+ }
}
return pe;
});
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.15.1/src/schema/general.rnc new/autoyast2-2.15.3/src/schema/general.rnc
--- old/autoyast2-2.15.1/src/schema/general.rnc 2006-09-08 13:11:48.000000000 +0200
+++ new/autoyast2-2.15.3/src/schema/general.rnc 2007-02-12 11:05:20.000000000 +0100
@@ -23,6 +23,7 @@
accept_file_without_checksum = element accept_file_without_checksum { BOOLEAN }
accept_verification_failed = element accept_verification_failed { BOOLEAN }
accept_unknown_gpg_key = element accept_unknown_gpg_key { BOOLEAN }
+accept_non_trusted_gpg_key = element accept_non_trusted_gpg_key { BOOLEAN }
import_gpg_key = element import_gpg_key { BOOLEAN }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.15.1/VERSION new/autoyast2-2.15.3/VERSION
--- old/autoyast2-2.15.1/VERSION 2007-01-31 15:30:39.000000000 +0100
+++ new/autoyast2-2.15.3/VERSION 2007-02-15 14:04:10.000000000 +0100
@@ -1 +1 @@
-2.15.1
+2.15.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org