Hello community,
here is the log from the commit of package autoyast2 for openSUSE:Factory
checked in at Fri Apr 30 01:25:33 CEST 2010.
--------
--- autoyast2/autoyast2.changes 2010-04-27 11:25:30.000000000 +0200
+++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2010-04-29 11:20:48.000000000 +0200
@@ -1,0 +2,12 @@
+Wed Apr 28 14:02:30 CEST 2010 - ug@suse.de
+
+- old callback behavior (popups) for add-ons if no
+ signature-handling is configured.
+- 2.19.7
+
+-------------------------------------------------------------------
+Wed Apr 28 11:14:29 CEST 2010 - ug@suse.de
+
+- path to image script fixed
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
autoyast2-2.19.6.tar.bz2
New:
----
autoyast2-2.19.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.Kta1vJ/_old 2010-04-30 01:18:41.000000000 +0200
+++ /var/tmp/diff_new_pack.Kta1vJ/_new 2010-04-30 01:18:41.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package autoyast2 (Version 2.19.6)
+# spec file for package autoyast2 (Version 2.19.7)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: autoyast2
-Version: 2.19.6
+Version: 2.19.7
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: autoyast2-2.19.6.tar.bz2
+Source0: autoyast2-2.19.7.tar.bz2
Prefix: /usr
@@ -65,7 +65,7 @@
%package installation
License: GPLv2+
-Version: 2.19.6
+Version: 2.19.7
Release: 1
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
@@ -82,7 +82,7 @@
generated with the autoyast2 package.
%prep
-%setup -n autoyast2-2.19.6
+%setup -n autoyast2-2.19.7
%build
%{prefix}/bin/y2tool y2autoconf
++++++ autoyast2-2.19.6.tar.bz2 -> autoyast2-2.19.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.6/VERSION new/autoyast2-2.19.7/VERSION
--- old/autoyast2-2.19.6/VERSION 2010-04-27 11:19:46.000000000 +0200
+++ new/autoyast2-2.19.7/VERSION 2010-04-29 11:17:27.000000000 +0200
@@ -1 +1 @@
-2.19.6
+2.19.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.6/configure new/autoyast2-2.19.7/configure
--- old/autoyast2-2.19.6/configure 2010-04-27 11:21:18.000000000 +0200
+++ new/autoyast2-2.19.7/configure 2010-04-29 11:17:33.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for autoyast2 2.19.6.
+# Generated by GNU Autoconf 2.63 for autoyast2 2.19.7.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='autoyast2'
PACKAGE_TARNAME='autoyast2'
-PACKAGE_VERSION='2.19.6'
-PACKAGE_STRING='autoyast2 2.19.6'
+PACKAGE_VERSION='2.19.7'
+PACKAGE_STRING='autoyast2 2.19.7'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1282,7 +1282,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.19.6 to adapt to many kinds of systems.
+\`configure' configures autoyast2 2.19.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1353,7 +1353,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of autoyast2 2.19.6:";;
+ short | recursive ) echo "Configuration of autoyast2 2.19.7:";;
esac
cat <<\_ACEOF
@@ -1433,7 +1433,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-autoyast2 configure 2.19.6
+autoyast2 configure 2.19.7
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1447,7 +1447,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.19.6, which was
+It was created by autoyast2 $as_me 2.19.7, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2427,7 +2427,7 @@
# Define the identity of the package.
PACKAGE='autoyast2'
- VERSION='2.19.6'
+ VERSION='2.19.7'
cat >>confdefs.h <<_ACEOF
@@ -2549,7 +2549,7 @@
-VERSION="2.19.6"
+VERSION="2.19.7"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
@@ -3609,7 +3609,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.19.6, which was
+This file was extended by autoyast2 $as_me 2.19.7, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3659,7 +3659,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-autoyast2 config.status 2.19.6
+autoyast2 config.status 2.19.7
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/autoyast2-2.19.6/configure.in new/autoyast2-2.19.7/configure.in
--- old/autoyast2-2.19.6/configure.in 2010-04-27 11:21:15.000000000 +0200
+++ new/autoyast2-2.19.7/configure.in 2010-04-29 11:17:30.000000000 +0200
@@ -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(autoyast2, 2.19.6, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 2.19.7, 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.19.6"
+VERSION="2.19.7"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.6/src/modules/AutoInstall.ycp new/autoyast2-2.19.7/src/modules/AutoInstall.ycp
--- old/autoyast2-2.19.6/src/modules/AutoInstall.ycp 2009-06-30 12:11:06.000000000 +0200
+++ new/autoyast2-2.19.7/src/modules/AutoInstall.ycp 2010-04-28 14:05:16.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Auto-installation related functions module
* Author: Anas Nashif
*
- * $Id: AutoInstall.ycp 57800 2009-06-30 10:11:05Z ug $
+ * $Id: AutoInstall.ycp 61896 2010-04-28 12:05:15Z ug $
*/
{
module "AutoInstall";
@@ -79,6 +79,15 @@
global define boolean callbackFalse_boolean_string_string_integer(string dummy1, string dummy2, integer dummy3) {
return false;
}
+
+ global define boolean callbackTrue_boolean_string_string_string(string dummy1, string dummy2, string dummy3) {
+ return true;
+ }
+
+ global define boolean callbackFalse_boolean_string_string_string(string dummy1, string dummy2, string 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.19.6/src/modules/AutoinstGeneral.ycp new/autoyast2-2.19.7/src/modules/AutoinstGeneral.ycp
--- old/autoyast2-2.19.6/src/modules/AutoinstGeneral.ycp 2010-04-27 11:21:11.000000000 +0200
+++ new/autoyast2-2.19.7/src/modules/AutoinstGeneral.ycp 2010-04-28 14:05:16.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Configuration of general settings for autoyast
* Authors: Anas Nashif (nashif@suse.de)
*
- * $Id: AutoinstGeneral.ycp 61884 2010-04-27 09:21:10Z ug $
+ * $Id: AutoinstGeneral.ycp 61896 2010-04-28 12:05:15Z ug $
*/
{
@@ -25,6 +25,7 @@
import "Pkg";
import "ProductFeatures";
import "Storage";
+ import "SignatureCheckCallbacks";
// All shared data are in yast2.rpm to break cyclic dependencies
import "AutoinstData";
@@ -177,6 +178,20 @@
* @return void
*/
global define void SetSignatureHandling() {
+
+ // this will break compatibility a bit. A XML file without signature handling can
+ // block the installation now because we have the popups back
+ Pkg::CallbackAcceptUnsignedFile (SignatureCheckCallbacks::AcceptUnsignedFile);
+ Pkg::CallbackAcceptFileWithoutChecksum (SignatureCheckCallbacks::AcceptFileWithoutChecksum);
+ Pkg::CallbackAcceptVerificationFailed (SignatureCheckCallbacks::AcceptVerificationFailed);
+ Pkg::CallbackTrustedKeyAdded (SignatureCheckCallbacks::TrustedKeyAdded);
+ Pkg::CallbackAcceptUnknownGpgKey (SignatureCheckCallbacks::AcceptUnknownGpgKey);
+ Pkg::CallbackImportGpgKey (SignatureCheckCallbacks::ImportGpgKey);
+ Pkg::CallbackAcceptNonTrustedGpgKey (SignatureCheckCallbacks::TrustGpgKey);
+ Pkg::CallbackAcceptWrongDigest (SignatureCheckCallbacks::AcceptWrongDigest);
+ Pkg::CallbackAcceptUnknownDigest (SignatureCheckCallbacks::AcceptUnknownDigest);
+ Pkg::CallbackTrustedKeyRemoved (SignatureCheckCallbacks::TrustedKeyRemoved);
+
if( haskey(signature_handling, "accept_unsigned_file" ) )
Pkg::CallbackAcceptUnsignedFile(
signature_handling["accept_unsigned_file"]:false ? AutoInstall::callbackTrue_boolean_string_integer : AutoInstall::callbackFalse_boolean_string_integer
@@ -209,6 +224,14 @@
Pkg::CallbackAcceptNonTrustedGpgKey(
signature_handling["accept_non_trusted_gpg_key"]:false ? AutoInstall::callbackTrue_boolean_map : AutoInstall::callbackFalse_boolean_map
);
+ if( haskey(signature_handling, "accept_wrong_digest") )
+ Pkg::CallbackAcceptWrongDigest(
+ signature_handling["accept_wrong_digest":false ? AutoInstall::callbackTrue_boolean_string_string_string : AutoInstall::callbackFalse_boolean_string_string_string
+ );
+ if( haskey(signature_handling, "accept_unknown_digest") )
+ Pkg::CallbackAcceptWrongDigest(
+ signature_handling["accept_unknown_digest":false ? AutoInstall::callbackTrue_boolean_string_string : AutoInstall::callbackFalse_boolean_string_string
+ );
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.6/src/modules/AutoinstSoftware.ycp new/autoyast2-2.19.7/src/modules/AutoinstSoftware.ycp
--- old/autoyast2-2.19.6/src/modules/AutoinstSoftware.ycp 2010-02-19 11:09:48.000000000 +0100
+++ new/autoyast2-2.19.7/src/modules/AutoinstSoftware.ycp 2010-04-28 11:36:36.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Software
* Authors: Anas Nashif
*
- * $Id: AutoinstSoftware.ycp 60864 2010-02-19 10:09:47Z ug $
+ * $Id: AutoinstSoftware.ycp 61894 2010-04-28 09:36:35Z ug $
*
*/
{
@@ -310,11 +310,12 @@
// don't copy subdirs. They have to be mentioned explicit. Copy only files from that dir.
y2milestone("will get %1 from %2 to %3", file, instsource+"/"+source, target );
if( size(file) > 0 && substring( file, size(file)-1 ) != "/" )
- if( !GetURL( instsource+"/"+source+file, target+"/"+source+"/"+file ) ) {
- Popup::Error( sformat(_("can not read '%1'. ISO creation failed"), instsource+"/"+source+file ) );
- ret = false;
- break;
+ while( ret && !GetURL( instsource+"/"+source+file, target+"/"+source+"/"+file ) ) {
+ if( !Popup::YesNo( sformat(_("can not read '%1'. Try again?"), instsource+"/"+source+file ) ) )
+ ret = false;
}
+ if( !ret )
+ break;
});
} else {
// copy a file
@@ -327,7 +328,7 @@
});
// lets always copy an optional(!) driverupdate file. It's very unlikely that it's in directory.yast
GetURL( instsource+"/driverupdate", target+"/driverupdate" );
- SCR::Execute (.target.bash, sformat("cp /var/adm/autoinstall/scripts/fetch_image.sh %1/",target) );
+ SCR::Execute (.target.bash, sformat("cp /usr/lib/YaST2/bin/fetch_image.sh %1/",target) );
return ret;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org