Hello community,
here is the log from the commit of package yast2
checked in at Fri Apr 6 16:36:23 CEST 2007.
--------
--- yast2/yast2.changes 2007-04-02 14:48:50.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2007-04-06 15:36:43.000000000 +0200
@@ -1,0 +2,15 @@
+Fri Apr 6 15:34:36 CEST 2007 - locilka@suse.cz
+
+- Adding new Installation::reboot_net_settings that will point to
+ a file storing current nework services settings when rebooting
+ a computer during installation (#258742).
+- Adding comments for Installation::* variables
+- 2.15.25
+
+-------------------------------------------------------------------
+Fri Apr 6 11:18:10 CEST 2007 - lslezak@suse.cz
+
+- register Pkg::CallbackAuthentication() callback (#190609)
+- 2.15.24
+
+-------------------------------------------------------------------
Old:
----
yast2-2.15.23.tar.bz2
New:
----
yast2-2.15.25.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.Xl3929/_old 2007-04-06 16:36:04.000000000 +0200
+++ /var/tmp/diff_new_pack.Xl3929/_new 2007-04-06 16:36:04.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.15.23)
+# spec file for package yast2 (Version 2.15.25)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,18 +11,18 @@
# norootforbuild
Name: yast2
-Version: 2.15.23
+Version: 2.15.25
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.15.23.tar.bz2
+Source0: yast2-2.15.25.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite
# SCR::RegisterNewAgents()
Requires: yast2-core >= 2.15.4
-# Pkg::CallbackSourceCreateInit/Destroy()
-Requires: yast2-pkg-bindings >= 2.15.13
+# Pkg::CallbackAuthentication()
+Requires: yast2-pkg-bindings >= 2.15.14
Requires: yast2_ui yast2_theme
# For Cron Agent, Module
Requires: perl-Config-Crontab
@@ -101,7 +101,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.15.23
+%setup -n yast2-2.15.25
%build
%{prefix}/bin/y2tool y2autoconf
@@ -209,6 +209,15 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Fri Apr 06 2007 - locilka@suse.cz
+- Adding new Installation::reboot_net_settings that will point to
+ a file storing current nework services settings when rebooting
+ a computer during installation (#258742).
+- Adding comments for Installation::* variables
+- 2.15.25
+* Fri Apr 06 2007 - lslezak@suse.cz
+- register Pkg::CallbackAuthentication() callback (#190609)
+- 2.15.24
* Mon Apr 02 2007 - jsuchome@suse.cz
- fixed restarting after Patch CD update (#259825)
- 2.15.23
++++++ yast2-2.15.23.tar.bz2 -> yast2-2.15.25.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.23/configure new/yast2-2.15.25/configure
--- old/yast2-2.15.23/configure 2007-04-02 14:43:13.000000000 +0200
+++ new/yast2-2.15.25/configure 2007-04-06 15:49:03.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2 2.15.23.
+# Generated by GNU Autoconf 2.60 for yast2 2.15.25.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.15.23'
-PACKAGE_STRING='yast2 2.15.23'
+PACKAGE_VERSION='2.15.25'
+PACKAGE_STRING='yast2 2.15.25'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1183,7 +1183,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.15.23 to adapt to many kinds of systems.
+\`configure' configures yast2 2.15.25 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1254,7 +1254,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 2.15.23:";;
+ short | recursive ) echo "Configuration of yast2 2.15.25:";;
esac
cat <<\_ACEOF
@@ -1332,7 +1332,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.15.23
+yast2 configure 2.15.25
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1346,7 +1346,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.15.23, which was
+It was created by yast2 $as_me 2.15.25, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2147,7 +2147,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='2.15.23'
+ VERSION='2.15.25'
cat >>confdefs.h <<_ACEOF
@@ -2374,7 +2374,7 @@
-VERSION="2.15.23"
+VERSION="2.15.25"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
@@ -3366,7 +3366,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.15.23, which was
+This file was extended by yast2 $as_me 2.15.25, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3409,7 +3409,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2 config.status 2.15.23
+yast2 config.status 2.15.25
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/yast2-2.15.23/configure.in new/yast2-2.15.25/configure.in
--- old/yast2-2.15.23/configure.in 2007-04-02 14:43:08.000000000 +0200
+++ new/yast2-2.15.25/configure.in 2007-04-06 15:48:58.000000000 +0200
@@ -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(yast2, 2.15.23, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.15.25, http://bugs.opensuse.org/, yast2)
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.23"
+VERSION="2.15.25"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.23/data/Makefile.am new/yast2-2.15.25/data/Makefile.am
--- old/yast2-2.15.23/data/Makefile.am 2007-02-12 13:08:12.000000000 +0100
+++ new/yast2-2.15.25/data/Makefile.am 2007-04-06 15:33:42.000000000 +0200
@@ -4,8 +4,6 @@
xversiondir = $(sysconfdir)/YaST2
-fillupdir = /var/adm/fillup-templates
-
xversion_DATA = \
XVersion
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.23/data/Makefile.in new/yast2-2.15.25/data/Makefile.in
--- old/yast2-2.15.23/data/Makefile.in 2007-04-02 14:43:14.000000000 +0200
+++ new/yast2-2.15.25/data/Makefile.in 2007-04-06 15:49:04.000000000 +0200
@@ -136,7 +136,7 @@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
execcompdir = @execcompdir@
-fillupdir = /var/adm/fillup-templates
+fillupdir = @fillupdir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.23/library/control/src/Installation.ycp new/yast2-2.15.25/library/control/src/Installation.ycp
--- old/yast2-2.15.23/library/control/src/Installation.ycp 2007-03-19 12:55:18.000000000 +0100
+++ new/yast2-2.15.25/library/control/src/Installation.ycp 2007-04-06 15:36:58.000000000 +0200
@@ -12,7 +12,7 @@
* Klaus Kaempf
* Lukas Ocilka
*
- * $Id: Installation.ycp 36841 2007-03-12 07:44:54Z locilka $
+ * $Id: Installation.ycp 37358 2007-04-06 13:36:55Z locilka $
*/
{
@@ -54,46 +54,67 @@
boolean _text_fallback = nil;
boolean _no_x11 = nil;
- // --> configuration from installation_worker.ycp
- global string Installation::file_inst_aborted = Directory::vardir + "/second_stage_aborted";
- global string Installation::file_inst_failed = Directory::vardir + "/second_stage_failed";
- global string Installation::run_yast_at_boot = Directory::vardir + "/runme_at_boot";
- global string Installation::current_step = Directory::vardir + "/step";
- global string Installation::file_update_mode = Directory::vardir + "/update_mode";
- global string Installation::restart_data_file = Directory::vardir + "/continue_installation";
- global string Installation::reboot_file = Directory::vardir + "/reboot";
- global string Installation::restart_file = Directory::vardir + "/restart_yast";
- // <-- configuration from installation_worker.ycp
-
-//
-// variables to store data of the installation clients
-//
-
-// inst_license
-
-/**
- * The license has already been accepted, the respectiev radio button
- * can be preselected
- */
-global boolean license_accepted = false;
+
+ // --> configuration from installation.ycp
+
+ // Second stage installation has been aborted by user
+ global string Installation::file_inst_aborted = Directory::vardir + "/second_stage_aborted";
+
+ // Second stage installation has been killed or just somehow failed
+ global string Installation::file_inst_failed = Directory::vardir + "/second_stage_failed";
+
+ // Installation scripts (YaST) will be started at boot time
+ global string Installation::run_yast_at_boot = Directory::vardir + "/runme_at_boot";
+
+ // The current installation step (useful for restarting YaST or rebooting)
+ global string Installation::current_step = Directory::vardir + "/step";
+
+ // Update instead on New Installation
+ global string Installation::file_update_mode = Directory::vardir + "/update_mode";
+
+ // Second stage installation (Stage::cont())
+ global string Installation::restart_data_file = Directory::vardir + "/continue_installation";
+
+ // Computer has been rebooted
+ global string Installation::reboot_file = Directory::vardir + "/reboot";
+
+ // Just restarting YaST (handled by startup scripts)
+ global string Installation::restart_file = Directory::vardir + "/restart_yast";
+
+ // Network should be started before the installation starts (continues)
+ // bugzilla #258742
+ //
+ // File contains a YCP map with services and their status when Installation was about to reboot
+ // e.g., $[ "network" : true, "portmap" : false, "SuSEfirewall2" : true ]
+ global string Installation::reboot_net_settings = Directory::vardir + "/reboot_network_settings";
+
+ // <-- configuration from installation.ycp
+
+
+ //
+ // variables to store data of the installation clients
+ //
+
+ // inst_license
+
+ /**
+ * The license has already been accepted, the respectiev radio button
+ * can be preselected
+ */
+ global boolean license_accepted = false;
//---------------------------------------------------------------
// constructor
- global define void Installation ()
- ``{
-
+ global define void Installation () {
// get setup data from linuxrc
// check setup/descr/info for CD type
- if (Stage::cont ())
- {
+ if (Stage::cont ()) {
destdir = "/";
scr_destdir = "/";
- }
- else if (Stage::initial ())
- {
+ } else if (Stage::initial ()) {
destdir = "/mnt";
scr_destdir = "/mnt";
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.23/library/control/src/ProductControl.ycp new/yast2-2.15.25/library/control/src/ProductControl.ycp
--- old/yast2-2.15.23/library/control/src/ProductControl.ycp 2007-04-02 13:54:48.000000000 +0200
+++ new/yast2-2.15.25/library/control/src/ProductControl.ycp 2007-04-06 15:36:58.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Product Control routines
* Authors: Anas Nashif
*
- * $Id: ProductControl.ycp 37209 2007-03-29 13:47:18Z locilka $
+ * $Id: ProductControl.ycp 37358 2007-04-06 13:36:55Z locilka $
*/
{
textdomain "base";
@@ -22,6 +22,7 @@
import "Hooks";
import "Popup";
import "FileUtils";
+import "Installation";
// The complete parsed control file
global map productControl = $[];
@@ -931,7 +932,7 @@
// Register what step we are going to run
if (!Stage::initial())
{
- if (!SCR::Write (.target.string, "/var/lib/YaST2/step", step_id))
+ if (! (boolean) SCR::Write (.target.string, Installation::current_step, step_id))
y2error("Error writing step identifier");
}
@@ -941,7 +942,7 @@
// Remove file if step was run and returned (without a crash);
if (current_step < size(modules) - 1 && !Stage::initial())
{
- if (!(boolean)SCR::Execute(.target.remove, "/var/lib/YaST2/step"))
+ if (!(boolean)SCR::Execute(.target.remove, Installation::current_step))
y2error("Error removing step identifier");
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.23/library/modules/Popup.ycp new/yast2-2.15.25/library/modules/Popup.ycp
--- old/yast2-2.15.23/library/modules/Popup.ycp 2007-01-22 08:35:57.000000000 +0100
+++ new/yast2-2.15.25/library/modules/Popup.ycp 2007-04-05 13:44:03.000000000 +0200
@@ -7,7 +7,7 @@
* Arvin Schnell
* Flags: Stable
*
- * $Id: Popup.ycp 35519 2007-01-19 09:23:33Z jsuchome $
+ * $Id: Popup.ycp 37321 2007-04-05 08:01:51Z jsuchome $
*
* Contains commonly used popup dialogs
* for general usage, e.g. Popup::YesNo(), Popup::ContinueCancel().
@@ -786,7 +786,7 @@
`VBox (
`HSpacing (default_width),
`VSpacing (0.5),
- `RichText (details),
+ `RichText (mergestring(splitstring(String::EscapeTags(details), "\n"), "<br>")),
`VSpacing (),
`PushButton (`id(`ok), `opt(`default, `key_F10), Label::OKButton())
)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.23/library/modules/Version.ycp new/yast2-2.15.25/library/modules/Version.ycp
--- old/yast2-2.15.23/library/modules/Version.ycp 2007-04-02 14:43:33.000000000 +0200
+++ new/yast2-2.15.25/library/modules/Version.ycp 2007-04-06 15:49:16.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.15.23";
+global string yast2 = "2.15.25";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.23/library/packages/src/PackageCallbacksInit.ycp new/yast2-2.15.25/library/packages/src/PackageCallbacksInit.ycp
--- old/yast2-2.15.23/library/packages/src/PackageCallbacksInit.ycp 2007-04-02 14:14:05.000000000 +0200
+++ new/yast2-2.15.25/library/packages/src/PackageCallbacksInit.ycp 2007-04-06 15:33:42.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Initialize packager callbacks
* Authors: Jiri Srain
*
- * $Id: PackageCallbacksInit.ycp 37248 2007-04-02 12:14:01Z lslezak $
+ * $Id: PackageCallbacksInit.ycp 37352 2007-04-06 11:43:39Z lslezak $
*
* This module is used to initialize package manager callbacks
*/
@@ -101,6 +101,8 @@
Pkg::CallbackSourceReportInit("PackageCallbacks::SourceReportInit");
Pkg::CallbackSourceReportDestroy("PackageCallbacks::SourceReportDestroy");
+ // authentication callback
+ Pkg::CallbackAuthentication("PackageCallbacks::Authentication");
// @see bugzilla #183821
// Do not register these callbacks in case of AutoInstallation
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.23/VERSION new/yast2-2.15.25/VERSION
--- old/yast2-2.15.23/VERSION 2007-04-02 14:42:32.000000000 +0200
+++ new/yast2-2.15.25/VERSION 2007-04-06 15:33:58.000000000 +0200
@@ -1 +1 @@
-2.15.23
+2.15.25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org