Hello community,
here is the log from the commit of package yast2-installation
checked in at Tue May 16 16:01:41 CEST 2006.
--------
--- yast2-installation/yast2-installation.changes 2006-05-11 14:01:47.000000000 +0200
+++ /work/users/ro/FROM101/yast2-installation/yast2-installation.changes 2006-05-16 13:55:20.000000000 +0200
@@ -1,0 +2,19 @@
+Tue May 16 13:29:38 CEST 2006 - jsrain@suse.cz
+
+- marked missed text for translation (#175930)
+- 2.13.107
+
+-------------------------------------------------------------------
+Mon May 15 12:59:58 CEST 2006 - jsrain@suse.cz
+
+- handle additional data for installation restart (#167561)
+
+-------------------------------------------------------------------
+Fri May 12 14:11:18 CEST 2006 - jsrain@suse.cz
+
+- initialize callbacks before adding an add-on product, properly
+ handle installation sources of add-on products (both if preparing
+ AutoYaST configuration (#172837)
+- 2.13.106
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.13.105.tar.bz2
New:
----
yast2-installation-2.13.107.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.5ef2cQ/_old 2006-05-16 15:57:56.000000000 +0200
+++ /var/tmp/diff_new_pack.5ef2cQ/_new 2006-05-16 15:57:56.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.13.105)
+# spec file for package yast2-installation (Version 2.13.107)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-installation
-Version: 2.13.105
+Version: 2.13.107
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.13.105.tar.bz2
+Source0: yast2-installation-2.13.107.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite
Requires: yast2 yast2-update
@@ -48,7 +48,7 @@
Arvin Schnell
%prep
-%setup -n yast2-installation-2.13.105
+%setup -n yast2-installation-2.13.107
%build
%{prefix}/bin/y2tool y2autoconf
@@ -106,6 +106,16 @@
/usr/X11R6/share/fvwm/
%changelog -n yast2-installation
+* Tue May 16 2006 - jsrain@suse.cz
+- marked missed text for translation (#175930)
+- 2.13.107
+* Mon May 15 2006 - jsrain@suse.cz
+- handle additional data for installation restart (#167561)
+* Fri May 12 2006 - jsrain@suse.cz
+- initialize callbacks before adding an add-on product, properly
+ handle installation sources of add-on products (both if preparing
+ AutoYaST configuration (#172837)
+- 2.13.106
* Thu May 11 2006 - jsrain@suse.cz
- do not disable automatic modprobe before adding add-on products
(#172149)
++++++ yast2-installation-2.13.105.tar.bz2 -> yast2-installation-2.13.107.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.105/VERSION new/yast2-installation-2.13.107/VERSION
--- old/yast2-installation-2.13.105/VERSION 2006-05-11 13:58:44.000000000 +0200
+++ new/yast2-installation-2.13.107/VERSION 2006-05-16 13:43:52.000000000 +0200
@@ -1 +1 @@
-2.13.105
+2.13.107
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.105/configure new/yast2-installation-2.13.107/configure
--- old/yast2-installation-2.13.105/configure 2006-05-11 14:00:45.000000000 +0200
+++ new/yast2-installation-2.13.107/configure 2006-05-16 13:54:15.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.105.
+# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.107.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='2.13.105'
-PACKAGE_STRING='yast2-installation 2.13.105'
+PACKAGE_VERSION='2.13.107'
+PACKAGE_STRING='yast2-installation 2.13.107'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -728,7 +728,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-installation 2.13.105 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.13.107 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-installation 2.13.105:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.13.107:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-installation configure 2.13.105
+yast2-installation configure 2.13.107
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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-installation $as_me 2.13.105, which was
+It was created by yast2-installation $as_me 2.13.107, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-installation'
- VERSION='2.13.105'
+ VERSION='2.13.107'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.105"
+VERSION="2.13.107"
RPMNAME="yast2-installation"
MAINTAINER="Jiri Srain "
@@ -2906,7 +2906,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-installation $as_me 2.13.105, which was
+This file was extended by yast2-installation $as_me 2.13.107, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2961,7 +2961,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-installation config.status 2.13.105
+yast2-installation config.status 2.13.107
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.105/configure.in new/yast2-installation-2.13.107/configure.in
--- old/yast2-installation-2.13.105/configure.in 2006-05-11 14:00:40.000000000 +0200
+++ new/yast2-installation-2.13.107/configure.in 2006-05-16 13:54:09.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.13.105, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.13.107, http://bugs.opensuse.org/, yast2-installation)
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.13.105"
+VERSION="2.13.107"
RPMNAME="yast2-installation"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.105/control.pot new/yast2-installation-2.13.107/control.pot
--- old/yast2-installation-2.13.105/control.pot 2006-05-04 14:04:29.000000000 +0200
+++ new/yast2-installation-2.13.107/control.pot 2006-05-16 13:34:45.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-04 14:04+0200\n"
+"POT-Creation-Date: 2006-05-16 13:34+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.105/installation.pot new/yast2-installation-2.13.107/installation.pot
--- old/yast2-installation-2.13.105/installation.pot 2006-05-04 14:04:29.000000000 +0200
+++ new/yast2-installation-2.13.107/installation.pot 2006-05-16 13:34:45.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-04 14:04+0200\n"
+"POT-Creation-Date: 2006-05-16 13:34+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -237,7 +237,7 @@
"resolved before continuing.\n"
msgstr ""
-#: src/clients/add-on_auto.ycp:55
+#: src/clients/add-on_auto.ycp:57
#, ycp-format
msgid "<li>Media: %1, Path: %2, Product: %3</li>\n"
msgstr ""
@@ -254,11 +254,16 @@
#. placeholder for unknown path
#. placeholder for unknown URL
#: src/clients/add-on_proposal.ycp:27 src/clients/add-on_proposal.ycp:31
-#: src/include/add-on-workflow.ycp:415 src/include/add-on-workflow.ycp:420
-#: src/include/add-on-workflow.ycp:770 src/include/add-on-workflow.ycp:776
+#: src/include/add-on-workflow.ycp:416 src/include/add-on-workflow.ycp:421
+#: src/include/add-on-workflow.ycp:786 src/include/add-on-workflow.ycp:792
msgid "Unknown"
msgstr ""
+#. summary string
+#: src/clients/add-on_proposal.ycp:36
+msgid "No add-on product selected for installation"
+msgstr ""
+
#. this is a heading
#: src/clients/add-on_proposal.ycp:61
msgid "Add-On Products"
@@ -292,7 +297,7 @@
#. feedback heading
#. main screen heading
#: src/clients/inst_addon_update_sources.ycp:51
-#: src/include/add-on-workflow.ycp:763
+#: src/include/add-on-workflow.ycp:779
msgid "Add-On Product Installation"
msgstr ""
@@ -785,99 +790,99 @@
#. strings for main (wizard) layout
#. Translators: This is title/brand - verify how to translate it correctly
-#: src/clients/inst_suse_register.ycp:65
+#: src/clients/inst_suse_register.ycp:66
msgid "Novell Customer Center Configuration"
msgstr ""
#. Translators: Module Title for the Box
-#: src/clients/inst_suse_register.ycp:68
+#: src/clients/inst_suse_register.ycp:69
msgid "Online Update Configuration"
msgstr ""
-#: src/clients/inst_suse_register.ycp:75
+#: src/clients/inst_suse_register.ycp:76
msgid ""
"Get technical support and product updates and\n"
"manage subscriptions with Novell Customer Center."
msgstr ""
-#: src/clients/inst_suse_register.ycp:81
+#: src/clients/inst_suse_register.ycp:80
msgid "Configure Now (Recommended)"
msgstr ""
-#: src/clients/inst_suse_register.ycp:82
+#: src/clients/inst_suse_register.ycp:81
msgid "Configure Later"
msgstr ""
-#: src/clients/inst_suse_register.ycp:84
+#: src/clients/inst_suse_register.ycp:83
msgid "Include for Convenience"
msgstr ""
#. Translators: Text for UI Label - capitalized
-#: src/clients/inst_suse_register.ycp:85
+#: src/clients/inst_suse_register.ycp:84
#: src/clients/suse_register_auto.ycp:198
msgid "Hardware Profile"
msgstr ""
#. Translators: Text for UI Label - capitalized
-#: src/clients/inst_suse_register.ycp:86
+#: src/clients/inst_suse_register.ycp:85
#: src/clients/suse_register_auto.ycp:200
msgid "Optional Information"
msgstr ""
-#: src/clients/inst_suse_register.ycp:87
+#: src/clients/inst_suse_register.ycp:86
msgid "Registration Code"
msgstr ""
-#: src/clients/inst_suse_register.ycp:88
-#: src/clients/inst_suse_register.ycp:187
+#: src/clients/inst_suse_register.ycp:87
+#: src/clients/inst_suse_register.ycp:186
msgid "Details..."
msgstr ""
#. strings for success popup
-#: src/clients/inst_suse_register.ycp:92
+#: src/clients/inst_suse_register.ycp:91
msgid "Your configuration was successful."
msgstr ""
-#: src/clients/inst_suse_register.ycp:93
+#: src/clients/inst_suse_register.ycp:92
msgid "An update server has been added to your configuration."
msgstr ""
#. strings for manual interaction popup
-#: src/clients/inst_suse_register.ycp:97
+#: src/clients/inst_suse_register.ycp:96
msgid "Manual Interaction Required"
msgstr ""
-#: src/clients/inst_suse_register.ycp:98
+#: src/clients/inst_suse_register.ycp:97
msgid "Needed Information"
msgstr ""
-#: src/clients/inst_suse_register.ycp:99
+#: src/clients/inst_suse_register.ycp:98
msgid "Continue"
msgstr ""
-#: src/clients/inst_suse_register.ycp:101
+#: src/clients/inst_suse_register.ycp:100
msgid ""
"A Web browser will start in which to complete\n"
"the configuration on the opened Web site."
msgstr ""
#. string for show information popup
-#: src/clients/inst_suse_register.ycp:107
+#: src/clients/inst_suse_register.ycp:106
msgid "Registration and Privacy Information"
msgstr ""
-#: src/clients/inst_suse_register.ycp:111
+#: src/clients/inst_suse_register.ycp:110
msgid ""
"The server requires additional system information. Activating \n"
"submission of the hardware profile automatically."
msgstr ""
#. nonroot-message strings
-#: src/clients/inst_suse_register.ycp:116
+#: src/clients/inst_suse_register.ycp:115
msgid "Update Source Issues"
msgstr ""
-#: src/clients/inst_suse_register.ycp:118
+#: src/clients/inst_suse_register.ycp:117
msgid ""
"Registering as a regular user does not include the update source\n"
"in the Online Update YaST module. If you continue and later want \n"
@@ -888,28 +893,28 @@
msgstr ""
#. error messages
-#: src/clients/inst_suse_register.ycp:129
+#: src/clients/inst_suse_register.ycp:128
msgid "Error: Data received is invalid."
msgstr ""
-#: src/clients/inst_suse_register.ycp:130
+#: src/clients/inst_suse_register.ycp:129
msgid "Error: Could not retrieve data."
msgstr ""
-#: src/clients/inst_suse_register.ycp:132
+#: src/clients/inst_suse_register.ycp:131
msgid ""
"No Web browser available.\n"
"Run the suse_register command manually."
msgstr ""
-#: src/clients/inst_suse_register.ycp:136
+#: src/clients/inst_suse_register.ycp:135
msgid ""
"Your registration requires interactive input that is not\n"
"supported in text mode. Run YaST2 in the graphical mode or\n"
"run the suse_register command manually."
msgstr ""
-#: src/clients/inst_suse_register.ycp:144
+#: src/clients/inst_suse_register.ycp:143
msgid ""
"<p>\n"
"Configure your system to enable online updates by registering it with Novell.\n"
@@ -918,7 +923,7 @@
"</p>"
msgstr ""
-#: src/clients/inst_suse_register.ycp:152
+#: src/clients/inst_suse_register.ycp:151
msgid ""
"<p>\n"
"To simplify the registration process, include information from your system\n"
@@ -930,7 +935,7 @@
"</p>"
msgstr ""
-#: src/clients/inst_suse_register.ycp:163
+#: src/clients/inst_suse_register.ycp:162
msgid ""
"<p>\n"
"If you purchased your copy of this product, enable <b>Registration Code</b>\n"
@@ -939,7 +944,7 @@
"</p>"
msgstr ""
-#: src/clients/inst_suse_register.ycp:171
+#: src/clients/inst_suse_register.ycp:170
msgid ""
"<p>\n"
"No information is passed to anyone outside Novell. The data is used for\n"
@@ -950,25 +955,25 @@
msgstr ""
#. further strings
-#: src/clients/inst_suse_register.ycp:184
+#: src/clients/inst_suse_register.ycp:183
msgid "Checking..."
msgstr ""
-#: src/clients/inst_suse_register.ycp:185
-#: src/clients/inst_suse_register.ycp:188
+#: src/clients/inst_suse_register.ycp:184
+#: src/clients/inst_suse_register.ycp:187
msgid "Error"
msgstr ""
-#: src/clients/inst_suse_register.ycp:186
+#: src/clients/inst_suse_register.ycp:185
msgid "An error occurred while connecting to the server."
msgstr ""
-#: src/clients/inst_suse_register.ycp:189
+#: src/clients/inst_suse_register.ycp:188
msgid "Starting browser..."
msgstr ""
#. add update source
-#: src/clients/inst_suse_register.ycp:704
+#: src/clients/inst_suse_register.ycp:734
msgid "Setting up online update source..."
msgstr ""
@@ -1452,87 +1457,87 @@
#. Scanning network for SLP servers
#. translators: popup busy message
-#: src/include/add-on-workflow.ycp:65
+#: src/include/add-on-workflow.ycp:66
msgid "Scanning network..."
msgstr ""
#. error popup
-#: src/include/add-on-workflow.ycp:74
+#: src/include/add-on-workflow.ycp:75
msgid "No SLP catalogs found."
msgstr ""
#. translators: popup heading
-#: src/include/add-on-workflow.ycp:91
+#: src/include/add-on-workflow.ycp:92
msgid "Choose SLP Catalog"
msgstr ""
#. table header
-#: src/include/add-on-workflow.ycp:97
+#: src/include/add-on-workflow.ycp:98
msgid "Type"
msgstr ""
#. table header
-#: src/include/add-on-workflow.ycp:99
+#: src/include/add-on-workflow.ycp:100
msgid "URL"
msgstr ""
#. radio button
-#: src/include/add-on-workflow.ycp:174
+#: src/include/add-on-workflow.ycp:175
msgid "&Scan Using SLP..."
msgstr ""
#. radio button
-#: src/include/add-on-workflow.ycp:176
+#: src/include/add-on-workflow.ycp:177
msgid "&FTP..."
msgstr ""
#. radio button
-#: src/include/add-on-workflow.ycp:178
+#: src/include/add-on-workflow.ycp:179
msgid "&HTTP..."
msgstr ""
#. radio button
-#: src/include/add-on-workflow.ycp:180
+#: src/include/add-on-workflow.ycp:181
msgid "HTT&PS..."
msgstr ""
#. radio button
-#: src/include/add-on-workflow.ycp:182
+#: src/include/add-on-workflow.ycp:183
msgid "&SMB/CIFS"
msgstr ""
#. radio button
-#: src/include/add-on-workflow.ycp:184
+#: src/include/add-on-workflow.ycp:185
msgid "&NFS..."
msgstr ""
#. radio button
-#: src/include/add-on-workflow.ycp:186 src/include/add-on-workflow.ycp:203
+#: src/include/add-on-workflow.ycp:187 src/include/add-on-workflow.ycp:204
msgid "&CD..."
msgstr ""
#. radio button
-#: src/include/add-on-workflow.ycp:188 src/include/add-on-workflow.ycp:205
+#: src/include/add-on-workflow.ycp:189 src/include/add-on-workflow.ycp:206
msgid "&DVD..."
msgstr ""
#. radio button
-#: src/include/add-on-workflow.ycp:190 src/include/add-on-workflow.ycp:207
+#: src/include/add-on-workflow.ycp:191 src/include/add-on-workflow.ycp:208
msgid "&Local Directory..."
msgstr ""
#. radio button
-#: src/include/add-on-workflow.ycp:192 src/include/add-on-workflow.ycp:209
+#: src/include/add-on-workflow.ycp:193 src/include/add-on-workflow.ycp:210
msgid "Specify &URL..."
msgstr ""
#. dialog caption
-#: src/include/add-on-workflow.ycp:218
+#: src/include/add-on-workflow.ycp:219
msgid "Add-On Product Media"
msgstr ""
#. help
-#: src/include/add-on-workflow.ycp:220
+#: src/include/add-on-workflow.ycp:221
msgid ""
"<p><big><b>Catalog Media</b></big><br>\n"
"Add-on products can be installed from CD, over a\n"
@@ -1540,7 +1545,7 @@
msgstr ""
#. help, continued
-#: src/include/add-on-workflow.ycp:226
+#: src/include/add-on-workflow.ycp:227
msgid ""
"<p>\n"
"To install add-on product from <b>CD</b>,\n"
@@ -1548,7 +1553,7 @@
msgstr ""
#. help, continued
-#: src/include/add-on-workflow.ycp:231
+#: src/include/add-on-workflow.ycp:232
msgid ""
"<p>\n"
"The product CDs can be copied to the hard disk.\n"
@@ -1559,7 +1564,7 @@
msgstr ""
#. help, continued
-#: src/include/add-on-workflow.ycp:240
+#: src/include/add-on-workflow.ycp:241
msgid ""
"<p>\n"
"Network installation requires a working network connection.\n"
@@ -1576,42 +1581,42 @@
#. {
#. yes-no popup
#. popup question
-#: src/include/add-on-workflow.ycp:274 src/include/add-on-workflow.ycp:453
-#: src/include/add-on-workflow.ycp:656 src/modules/AddOnProduct.ycp:815
+#: src/include/add-on-workflow.ycp:275 src/include/add-on-workflow.ycp:454
+#: src/include/add-on-workflow.ycp:667 src/modules/AddOnProduct.ycp:815
msgid "Really abort add-on product installation?"
msgstr ""
-#: src/include/add-on-workflow.ycp:317
+#: src/include/add-on-workflow.ycp:318
msgid "Insert the add-on product CD"
msgstr ""
-#: src/include/add-on-workflow.ycp:325
+#: src/include/add-on-workflow.ycp:326
msgid "Insert the add-on product DVD"
msgstr ""
#. error report
-#: src/include/add-on-workflow.ycp:368
+#: src/include/add-on-workflow.ycp:369
msgid "No catalog found on medium."
msgstr ""
#. error report
-#: src/include/add-on-workflow.ycp:392 src/include/add-on-workflow.ycp:500
+#: src/include/add-on-workflow.ycp:393 src/include/add-on-workflow.ycp:501
msgid "Failed to initialize the catalog."
msgstr ""
#. table cell, %1 is URL, %2 is directory name
-#: src/include/add-on-workflow.ycp:418 src/include/add-on-workflow.ycp:774
+#: src/include/add-on-workflow.ycp:419 src/include/add-on-workflow.ycp:790
#, ycp-format
msgid "URL: %1, Directory: %2"
msgstr ""
#. dialog caption
-#: src/include/add-on-workflow.ycp:424
+#: src/include/add-on-workflow.ycp:425
msgid "Catalog Selection"
msgstr ""
#. help text
-#: src/include/add-on-workflow.ycp:426
+#: src/include/add-on-workflow.ycp:427
msgid ""
"<p><big><b>Catalog Selection</b></big><br>\n"
"There were multiple catalogs found on the selected medium.\n"
@@ -1619,39 +1624,39 @@
msgstr ""
#. popup message
-#: src/include/add-on-workflow.ycp:469
+#: src/include/add-on-workflow.ycp:470
msgid "Select a catalog."
msgstr ""
#. table cell
-#: src/include/add-on-workflow.ycp:540
+#: src/include/add-on-workflow.ycp:541
msgid "No product found in the catalog"
msgstr ""
#. message popup
-#: src/include/add-on-workflow.ycp:567
+#: src/include/add-on-workflow.ycp:573
msgid ""
"The product on the media is already installed\n"
"or selected for installation."
msgstr ""
#. message popup
-#: src/include/add-on-workflow.ycp:590
+#: src/include/add-on-workflow.ycp:596
msgid "Dependencies of the add-on product cannot be fullfilled."
msgstr ""
#. dialog caption
-#: src/include/add-on-workflow.ycp:629
+#: src/include/add-on-workflow.ycp:640
msgid "Product Selection"
msgstr ""
#. multi selection list
-#: src/include/add-on-workflow.ycp:633
+#: src/include/add-on-workflow.ycp:644
msgid "Available Products"
msgstr ""
#. help text
-#: src/include/add-on-workflow.ycp:637
+#: src/include/add-on-workflow.ycp:648
msgid ""
"<p><b><big>Product Selection</big></b><br>\n"
"There were multiple products found in the catalog. Select the products\n"
@@ -1659,27 +1664,27 @@
msgstr ""
#. message popup
-#: src/include/add-on-workflow.ycp:698
+#: src/include/add-on-workflow.ycp:709
msgid "Dependencies of the selected add-on products cannot be fullfilled."
msgstr ""
-#: src/include/add-on-workflow.ycp:779
+#: src/include/add-on-workflow.ycp:795
#, ycp-format
msgid "Product %1"
msgstr ""
#. table header
-#: src/include/add-on-workflow.ycp:784
+#: src/include/add-on-workflow.ycp:800
msgid "Media"
msgstr ""
#. table header
-#: src/include/add-on-workflow.ycp:786
+#: src/include/add-on-workflow.ycp:802
msgid "Product"
msgstr ""
#. message report
-#: src/include/add-on-workflow.ycp:815
+#: src/include/add-on-workflow.ycp:831
msgid "Select a product to delete."
msgstr ""
@@ -1697,7 +1702,7 @@
msgstr ""
#. translators: busy popup while registering the system
-#: src/modules/Register.ycp:262
+#: src/modules/Register.ycp:298
msgid "Contacting server..."
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.105/src/clients/add-on_auto.ycp new/yast2-installation-2.13.107/src/clients/add-on_auto.ycp
--- old/yast2-installation-2.13.105/src/clients/add-on_auto.ycp 2006-05-04 13:05:28.000000000 +0200
+++ new/yast2-installation-2.13.107/src/clients/add-on_auto.ycp 2006-05-12 13:02:32.000000000 +0200
@@ -22,6 +22,8 @@
import "AddOnProduct";
import "Progress";
+import "AutoinstSoftware";
+import "PackageCallbacksInit";
include "installation/add-on-workflow.ycp";
@@ -90,12 +92,10 @@
*/
else if (func == "Change") {
Wizard::CreateDialog ();
+ AutoinstSoftware::pmInit ();
+ PackageCallbacksInit::InitPackageCallbacks ();
ret = RunAddOnMainDialog (true, true);
UI::CloseDialog ();
- foreach (integer srcid, AddOnProduct::added_sources, {
- Pkg::SourceFinish (srcid);
- });
- AddOnProduct::added_sources = [];
return ret;
}
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.105/src/clients/add-on_proposal.ycp new/yast2-installation-2.13.107/src/clients/add-on_proposal.ycp
--- old/yast2-installation-2.13.105/src/clients/add-on_proposal.ycp 2006-05-11 13:26:52.000000000 +0200
+++ new/yast2-installation-2.13.107/src/clients/add-on_proposal.ycp 2006-05-16 12:48:37.000000000 +0200
@@ -33,7 +33,7 @@
if (size (items) == 0)
{
// summary string
- items = [ "No add-on product selected for installation" ];
+ items = [ _("No add-on product selected for installation") ];
}
ret = $[
"raw_proposal" : items,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.105/src/clients/installation.ycp new/yast2-installation-2.13.107/src/clients/installation.ycp
--- old/yast2-installation-2.13.105/src/clients/installation.ycp 2006-04-20 23:17:06.000000000 +0200
+++ new/yast2-installation-2.13.107/src/clients/installation.ycp 2006-05-15 13:00:17.000000000 +0200
@@ -12,7 +12,7 @@
* Describing and calling all submodules, depending on
* the installation should be started or continued.
*
- * $Id: installation.ycp 30311 2006-04-20 20:25:02Z jsrain $
+ * $Id: installation.ycp 30913 2006-05-15 11:00:14Z jsrain $
*/
{
textdomain "installation";
@@ -331,14 +331,20 @@
{
string contents = (string)
SCR::Read (.target.string, restart_data_file);
- integer next_step = tointeger (contents);
+ list<string> contents_lines = splitstring (contents, "\n");
+ integer next_step = tointeger ((string)(contents_lines[0]:nil));
+ integer restarting_step = tointeger ((string)(contents_lines[1]:nil));
if (next_step == nil)
{
y2error ("Data file specifying step to continue corrupted");
+ ProductControl::first_step = 0;
+ ProductControl::restarting_step = nil;
ret = ProductControl::Run();
}
else
{
+ ProductControl::first_step = next_step;
+ ProductControl::restarting_step = restarting_step;
ret = ProductControl::RunFrom (next_step, false);
}
SCR::Execute (.target.bash, sformat (
@@ -357,6 +363,7 @@
if (Stage::cont () && (ret == `reboot || ret == `restart_yast || ret == `restart_same_step))
{
integer last_step = ProductControl::CurrentStep ();
+ integer restarting_step = last_step;
if (ret == `restart_same_step)
{
last_step = last_step - 1;
@@ -364,7 +371,7 @@
}
integer next_step = last_step + 1;
SCR::Write (.target.string, restart_data_file,
- sformat ("%1", next_step));
+ sformat ("%1\n%2", next_step, restarting_step));
if (ret == `reboot)
{
SCR::Execute (.target.bash, sformat (
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.105/src/include/add-on-workflow.ycp new/yast2-installation-2.13.107/src/include/add-on-workflow.ycp
--- old/yast2-installation-2.13.105/src/include/add-on-workflow.ycp 2006-05-04 13:05:28.000000000 +0200
+++ new/yast2-installation-2.13.107/src/include/add-on-workflow.ycp 2006-05-12 14:04:37.000000000 +0200
@@ -22,6 +22,7 @@
import "AddOnProduct";
import "Linuxrc";
+import "Mode";
import "Popup";
import "Report";
import "SLP";
@@ -541,6 +542,11 @@
"media_url" : url,
"product_dir" : product_dir,
]);
+ if (Mode::config ())
+ {
+ AddOnProduct::mode_config_sources
+ = add (AddOnProduct::mode_config_sources, AddOnProduct::src_id);
+ }
return `next;
}
products = filter (map prod, products, {
@@ -618,6 +624,11 @@
"media_url" : url,
"product_dir" : product_dir,
]);
+ if (found_source == -1 && Mode::config ())
+ {
+ AddOnProduct::mode_config_sources =
+ add (AddOnProduct::mode_config_sources, AddOnProduct::src_id);
+ }
return `next;
}
y2milestone ("Running product selection dialog");
@@ -712,6 +723,11 @@
"product_dir" : product_dir,
]);
});
+ if ( AddOnProduct::src_id != -1 && Mode::config ())
+ {
+ AddOnProduct::mode_config_sources =
+ add (AddOnProduct::mode_config_sources, AddOnProduct::src_id);
+ }
}
else if (ret != `back)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.105/src/modules/AddOnProduct.ycp new/yast2-installation-2.13.107/src/modules/AddOnProduct.ycp
--- old/yast2-installation-2.13.105/src/modules/AddOnProduct.ycp 2006-05-11 13:40:34.000000000 +0200
+++ new/yast2-installation-2.13.107/src/modules/AddOnProduct.ycp 2006-05-12 13:13:07.000000000 +0200
@@ -83,7 +83,7 @@
global boolean modified = false;
-global list<integer> added_sources = [];
+global list<integer> mode_config_sources = [];
@@ -1072,8 +1072,25 @@
global boolean Import (map settings) {
add_on_products = settings["add_on_products"]:[];
modified = false;
+ if (Mode::config ())
+ {
+ foreach (map prod, add_on_products, {
+ string media = prod["media_url"]:"";
+ string pth = prod["product_dir"]:"/";
+ integer src = Pkg::SourceCreate (media, pth);
+ if (src != -1)
+ mode_config_sources = add (mode_config_sources, src);
+ });
+ }
return true;
}
+global void CleanModeConfigSources () {
+ foreach (integer src, mode_config_sources, {
+ Pkg::SourceDelete (src);
+ });
+ mode_config_sources = [];
+}
+
} // module end
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...