Hello community,
here is the log from the commit of package yast2-registration
checked in at Tue Oct 14 23:03:00 CEST 2008.
--------
--- yast2-registration/yast2-registration.changes 2008-10-13 18:42:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-registration/yast2-registration.changes 2008-10-14 19:49:31.201379000 +0200
@@ -1,0 +2,8 @@
+Tue Oct 14 18:06:33 CEST 2008 - jdsn@suse.de
+
+- check if initialization of SuseRegister succeeds (bnc#435188)
+- initialize the target to prevent repeated key import (bnc#435192)
+- adapting repo changes as well in autoYaST mode
+- 2.17.3
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-registration-2.17.2.tar.bz2
New:
----
yast2-registration-2.17.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.n32113/_old 2008-10-14 23:02:45.000000000 +0200
+++ /var/tmp/diff_new_pack.n32113/_new 2008-10-14 23:02:45.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-registration (Version 2.17.2)
+# spec file for package yast2-registration (Version 2.17.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-registration
-Version: 2.17.2
+Version: 2.17.3
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-registration-2.17.2.tar.bz2
+Source0: yast2-registration-2.17.3.tar.bz2
Prefix: /usr
Requires: yast2 >= 2.16.6
Requires: suseRegister
@@ -52,7 +52,7 @@
J. Daniel Schmidt
%prep
-%setup -n yast2-registration-2.17.2
+%setup -n yast2-registration-2.17.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -108,6 +108,11 @@
/var/adm/fillup-templates/sysconfig.suse_register-yast2-registration
/var/adm/fillup-templates/sysconfig.automatic_online_update-yast2-registration
%changelog
+* Tue Oct 14 2008 jdsn@suse.de
+- check if initialization of SuseRegister succeeds (bnc#435188)
+- initialize the target to prevent repeated key import (bnc#435192)
+- adapting repo changes as well in autoYaST mode
+- 2.17.3
* Mon Oct 13 2008 jdsn@suse.de
- support repository changes in catalogs (bnc#430896)
- added mandatory source refreshes
++++++ yast2-registration-2.17.2.tar.bz2 -> yast2-registration-2.17.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.2/configure new/yast2-registration-2.17.3/configure
--- old/yast2-registration-2.17.2/configure 2008-10-13 19:02:19.000000000 +0200
+++ new/yast2-registration-2.17.3/configure 2008-10-14 20:40:03.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-registration 2.17.2.
+# Generated by GNU Autoconf 2.61 for yast2-registration 2.17.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-registration'
PACKAGE_TARNAME='yast2-registration'
-PACKAGE_VERSION='2.17.2'
-PACKAGE_STRING='yast2-registration 2.17.2'
+PACKAGE_VERSION='2.17.3'
+PACKAGE_STRING='yast2-registration 2.17.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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-registration 2.17.2 to adapt to many kinds of systems.
+\`configure' configures yast2-registration 2.17.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-registration 2.17.2:";;
+ short | recursive ) echo "Configuration of yast2-registration 2.17.3:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-registration configure 2.17.2
+yast2-registration configure 2.17.3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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-registration $as_me 2.17.2, which was
+It was created by yast2-registration $as_me 2.17.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-registration'
- VERSION='2.17.2'
+ VERSION='2.17.3'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.2"
+VERSION="2.17.3"
RPMNAME="yast2-registration"
MAINTAINER="J. Daniel Schmidt "
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-registration $as_me 2.17.2, which was
+This file was extended by yast2-registration $as_me 2.17.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-registration config.status 2.17.2
+yast2-registration config.status 2.17.3
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/yast2-registration-2.17.2/configure.in new/yast2-registration-2.17.3/configure.in
--- old/yast2-registration-2.17.2/configure.in 2008-10-13 19:02:14.000000000 +0200
+++ new/yast2-registration-2.17.3/configure.in 2008-10-14 20:39:54.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(yast2-registration, 2.17.2, http://bugs.opensuse.org/, yast2-registration)
+AC_INIT(yast2-registration, 2.17.3, http://bugs.opensuse.org/, yast2-registration)
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.2"
+VERSION="2.17.3"
RPMNAME="yast2-registration"
MAINTAINER="J. Daniel Schmidt "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.2/registration.pot new/yast2-registration-2.17.3/registration.pot
--- old/yast2-registration-2.17.2/registration.pot 2008-09-26 16:37:06.000000000 +0200
+++ new/yast2-registration-2.17.3/registration.pot 2008-10-14 20:13:39.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-26 16:37+0200\n"
+"POT-Creation-Date: 2008-10-14 20:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,134 +17,146 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+#: src/clients/inst_suse_register.ycp:46
+msgid "Registration Module Help"
+msgstr ""
+
#. strings for main (wizard) layout
#. Translators: This is title/brand - verify how to translate it correctly
-#: src/clients/inst_suse_register.ycp:80
+#: src/clients/inst_suse_register.ycp:94
msgid "Novell Customer Center Configuration"
msgstr ""
#. Translators: Module Title for the Box
#. module title
-#: src/clients/inst_suse_register.ycp:83 src/dialogs/OUCDialogs.ycp:18
+#: src/clients/inst_suse_register.ycp:97 src/dialogs/OUCDialogs.ycp:18
msgid "Online Update Configuration"
msgstr ""
#. (#165509)
#. alternative short title text
-#: src/clients/inst_suse_register.ycp:86
+#: src/clients/inst_suse_register.ycp:100
msgid "Registration"
msgstr ""
-#: src/clients/inst_suse_register.ycp:87
+#: src/clients/inst_suse_register.ycp:101
msgid "Support Registration"
msgstr ""
#. Translators: limit to 2x 50 charachters - if more needed take 3x 50 chars but NOTHING more
-#: src/clients/inst_suse_register.ycp:95
+#: src/clients/inst_suse_register.ycp:109
msgid ""
"Get technical support and product updates and\n"
"manage subscriptions with Novell Customer Center."
msgstr ""
#. Translators: limit to 2x 50 charachters - if more needed take 3x 50 chars but NOTHING more
-#: src/clients/inst_suse_register.ycp:98
+#: src/clients/inst_suse_register.ycp:112
msgid ""
"Get technical support and product updates\n"
"by registering this installation."
msgstr ""
-#: src/clients/inst_suse_register.ycp:116
+#: src/clients/inst_suse_register.ycp:130
msgid "Configure Now (Recommended)"
msgstr ""
-#: src/clients/inst_suse_register.ycp:117
+#: src/clients/inst_suse_register.ycp:131
msgid "Configure Later"
msgstr ""
-#: src/clients/inst_suse_register.ycp:119
+#: src/clients/inst_suse_register.ycp:133
msgid "Include for Convenience"
msgstr ""
#. Translators: Text for UI Label - capitalized
-#: src/clients/inst_suse_register.ycp:120
+#: src/clients/inst_suse_register.ycp:134
#: src/clients/suse_register_auto.ycp:213
msgid "Hardware Profile"
msgstr ""
#. Translators: Text for UI Label - capitalized
-#: src/clients/inst_suse_register.ycp:121
+#: src/clients/inst_suse_register.ycp:135
#: src/clients/suse_register_auto.ycp:215
msgid "Optional Information"
msgstr ""
-#: src/clients/inst_suse_register.ycp:122
+#: src/clients/inst_suse_register.ycp:136
msgid "Registration Code"
msgstr ""
-#: src/clients/inst_suse_register.ycp:123
-#: src/clients/inst_suse_register.ycp:227
+#: src/clients/inst_suse_register.ycp:137
+#: src/clients/inst_suse_register.ycp:243
msgid "Details..."
msgstr ""
#. strings for success popup
-#: src/clients/inst_suse_register.ycp:127
+#: src/clients/inst_suse_register.ycp:141
msgid "Your configuration was successful."
msgstr ""
-#: src/clients/inst_suse_register.ycp:128
+#: src/clients/inst_suse_register.ycp:142
msgid "An update server has been added to your configuration."
msgstr ""
-#: src/clients/inst_suse_register.ycp:129
+#: src/clients/inst_suse_register.ycp:143
msgid "No update server could be added to your configuration."
msgstr ""
+#: src/clients/inst_suse_register.ycp:144
+msgid "No software repository needed to be changed."
+msgstr ""
+
+#: src/clients/inst_suse_register.ycp:145
+msgid "Software repositories did not need to be changed."
+msgstr ""
+
#. caption for details view
-#: src/clients/inst_suse_register.ycp:131
+#: src/clients/inst_suse_register.ycp:147
msgid "New Update Server"
msgstr ""
#. strings for manual interaction popup
-#: src/clients/inst_suse_register.ycp:134
+#: src/clients/inst_suse_register.ycp:150
msgid "Manual Interaction Required"
msgstr ""
-#: src/clients/inst_suse_register.ycp:135
+#: src/clients/inst_suse_register.ycp:151
msgid "Needed Information"
msgstr ""
-#: src/clients/inst_suse_register.ycp:136
+#: src/clients/inst_suse_register.ycp:152
msgid "Continue"
msgstr ""
-#: src/clients/inst_suse_register.ycp:137
+#: src/clients/inst_suse_register.ycp:153
msgid ""
"A Web browser will start in which to complete\n"
"the configuration on the opened Web site."
msgstr ""
-#: src/clients/inst_suse_register.ycp:141
+#: src/clients/inst_suse_register.ycp:157
msgid "Regularly Synchronize with the Customer Center"
msgstr ""
#. string for show information popup
-#: src/clients/inst_suse_register.ycp:144
+#: src/clients/inst_suse_register.ycp:160
msgid "Registration and Privacy Information"
msgstr ""
#. strings for conflict popup
-#: src/clients/inst_suse_register.ycp:147
+#: src/clients/inst_suse_register.ycp:163
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:151
+#: src/clients/inst_suse_register.ycp:167
msgid "Update Source Issues"
msgstr ""
-#: src/clients/inst_suse_register.ycp:152
+#: src/clients/inst_suse_register.ycp:168
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"
@@ -155,35 +167,35 @@
msgstr ""
#. error messages
-#: src/clients/inst_suse_register.ycp:162
+#: src/clients/inst_suse_register.ycp:178
msgid "Error: Data received is invalid."
msgstr ""
-#: src/clients/inst_suse_register.ycp:163
+#: src/clients/inst_suse_register.ycp:179 src/modules/Register.ycp:1358
msgid "Error: Could not retrieve data."
msgstr ""
-#: src/clients/inst_suse_register.ycp:164
+#: src/clients/inst_suse_register.ycp:180
msgid ""
"No Web browser available.\n"
"Run the suse_register command manually."
msgstr ""
-#: src/clients/inst_suse_register.ycp:166
+#: src/clients/inst_suse_register.ycp:182
msgid ""
"No product found to be registered.\n"
"You do not need to register this installation.\n"
"Please add update sources yourself."
msgstr ""
-#: src/clients/inst_suse_register.ycp:169
+#: src/clients/inst_suse_register.ycp:185
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:175
+#: src/clients/inst_suse_register.ycp:191
msgid ""
"<p>\n"
"Configure your system to enable online updates by registering it with Novell.\n"
@@ -192,7 +204,7 @@
"</p>"
msgstr ""
-#: src/clients/inst_suse_register.ycp:181
+#: src/clients/inst_suse_register.ycp:197
msgid ""
"<p>\n"
"To simplify the registration process, include information from your system\n"
@@ -204,7 +216,7 @@
"</p>"
msgstr ""
-#: src/clients/inst_suse_register.ycp:190
+#: src/clients/inst_suse_register.ycp:206
msgid ""
"<p>\n"
"If you purchased your copy of this product, enable <b>Registration Code</b>\n"
@@ -213,7 +225,7 @@
"</p>"
msgstr ""
-#: src/clients/inst_suse_register.ycp:196
+#: src/clients/inst_suse_register.ycp:212
msgid ""
"<p>\n"
"No information is passed to anyone outside Novell. The data is used for\n"
@@ -223,7 +235,7 @@
"</p>"
msgstr ""
-#: src/clients/inst_suse_register.ycp:203
+#: src/clients/inst_suse_register.ycp:219
msgid ""
"<p>\n"
"<b>Regularly Synchronize with the Customer Center</b> checks that your update \n"
@@ -234,7 +246,7 @@
"</p>"
msgstr ""
-#: src/clients/inst_suse_register.ycp:211
+#: src/clients/inst_suse_register.ycp:227
msgid ""
"<p>\n"
"The registration process will contact a Novell server (or a local registration server if your company provides one).\n"
@@ -244,38 +256,49 @@
msgstr ""
#. further strings
-#: src/clients/inst_suse_register.ycp:224
+#: src/clients/inst_suse_register.ycp:240
msgid "Checking..."
msgstr ""
-#: src/clients/inst_suse_register.ycp:225
-#: src/clients/inst_suse_register.ycp:228
+#: src/clients/inst_suse_register.ycp:241
+#: src/clients/inst_suse_register.ycp:244
msgid "Error"
msgstr ""
-#: src/clients/inst_suse_register.ycp:226
+#: src/clients/inst_suse_register.ycp:242
msgid "An error occurred while connecting to the server."
msgstr ""
-#: src/clients/inst_suse_register.ycp:229
+#: src/clients/inst_suse_register.ycp:245
msgid "Starting browser..."
msgstr ""
-#: src/clients/inst_suse_register.ycp:242 src/dialogs/texts.ycp:30
-msgid "Use local registration server"
+#: src/clients/inst_suse_register.ycp:246
+msgid ""
+"Initialization failed.\n"
+"Can not interact with the package system."
+msgstr ""
+
+#: src/clients/inst_suse_register.ycp:247
+msgid ""
+"In order to registrer properly the system\n"
+"needs to install the following packages."
msgstr ""
#. translators: a short button label called "Advanced"
-#: src/clients/inst_suse_register.ycp:269 src/dialogs/OUCDialogs.ycp:32
+#: src/clients/inst_suse_register.ycp:289 src/dialogs/OUCDialogs.ycp:32
#: src/dialogs/texts.ycp:29
msgid "Advanced"
msgstr ""
-#. add update source
-#: src/clients/inst_suse_register.ycp:783
+#: src/clients/inst_suse_register.ycp:873
msgid "Setting up online update source..."
msgstr ""
+#: src/clients/inst_suse_register.ycp:874
+msgid "Updating software repositories..."
+msgstr ""
+
#. Translators: Heading - capitalized
#: src/clients/suse_register_auto.ycp:64
#: src/clients/suse_register_auto.ycp:187
@@ -383,11 +406,13 @@
msgid "Registration Data to Use"
msgstr ""
-#: src/clients/suse_register_auto.ycp:226
+#. translators: "key" as in "key value pair"
+#: src/clients/suse_register_auto.ycp:226 src/dialogs/texts.ycp:44
msgid "Key"
msgstr ""
-#: src/clients/suse_register_auto.ycp:226
+#. translators: "value" as in "key value pair"
+#: src/clients/suse_register_auto.ycp:226 src/dialogs/texts.ycp:46
msgid "Value"
msgstr ""
@@ -502,12 +527,13 @@
msgid "monthly"
msgstr ""
-#: src/dialogs/texts.ycp:16 src/modules/Register.ycp:811
+#. translators: busy popup while registering the system
+#: src/dialogs/texts.ycp:16 src/modules/Register.ycp:719
msgid "Contacting server..."
msgstr ""
-#. translators: busy popup while registering the system
-#: src/dialogs/texts.ycp:17 src/modules/Register.ycp:809
+#. translators: Text for a busy-process-indicator while registering the system
+#: src/dialogs/texts.ycp:17 src/modules/Register.ycp:721
msgid "This may take a while"
msgstr ""
@@ -559,6 +585,10 @@
msgid "Starting registration..."
msgstr ""
+#: src/dialogs/texts.ycp:30
+msgid "Use local registration server"
+msgstr ""
+
#: src/dialogs/texts.ycp:31
msgid "Use custom registration server "
msgstr ""
@@ -597,23 +627,35 @@
"For details please see the help text."
msgstr ""
-#: src/dialogs/texts.ycp:45
+#: src/dialogs/texts.ycp:40
+msgid "Add custom registration data"
+msgstr ""
+
+#: src/dialogs/texts.ycp:41
+msgid "Add key value pairs:"
+msgstr ""
+
+#: src/dialogs/texts.ycp:42
+msgid "Please see the help for details."
+msgstr ""
+
+#: src/dialogs/texts.ycp:51
msgid "<p>To register this installation at a local registration server please configure the URL and optionally the server's CA certificate via the <b>Advanced</b> menu.</p>"
msgstr ""
-#: src/dialogs/texts.ycp:46
+#: src/dialogs/texts.ycp:52
msgid "<p>The registration server URL has to start with <i>https://</i> whereas the location of its CA certificate may be a URL of the format <i>http://</i>, <i>https://</i> or <i>ftp://</i>. Furthermore valid locations are <i>/path/on/local/disk</i>, <b>floppy</b><i>/path/on/floppy-disk</i> and the keyword <i>done</i>. The latter indicates that no CA certificate handling needs to be done in order to trust the registration server.</p>"
msgstr ""
-#: src/modules/Register.ycp:144
+#: src/modules/Register.ycp:151
msgid "Unknown error"
msgstr ""
-#: src/modules/Register.ycp:147
+#: src/modules/Register.ycp:154
msgid "Do you want to skip Registration?"
msgstr ""
-#: src/modules/Register.ycp:148
+#: src/modules/Register.ycp:155
#, ycp-format
msgid ""
"If you select %1 the Registration will most likely fail.\n"
@@ -621,91 +663,131 @@
"and then specify its path by choosing %2."
msgstr ""
-#: src/modules/Register.ycp:155
+#: src/modules/Register.ycp:162
msgid "Could not load the SMT certificate file from floppy disk."
msgstr ""
-#: src/modules/Register.ycp:159
+#: src/modules/Register.ycp:166
msgid "Could not download the SMT certificate file from specified URL."
msgstr ""
-#: src/modules/Register.ycp:163
+#: src/modules/Register.ycp:170
msgid "Could not find the SMT certificate file in specified path."
msgstr ""
-#: src/modules/Register.ycp:167
+#: src/modules/Register.ycp:174
msgid "Unknown error occurred while retrieving SMT certificate file"
msgstr ""
-#: src/modules/Register.ycp:171
+#: src/modules/Register.ycp:178
msgid "Skip"
msgstr ""
-#: src/modules/Register.ycp:255
+#: src/modules/Register.ycp:264
+msgid "The registration server URL could not be validated as URL."
+msgstr ""
+
+#: src/modules/Register.ycp:265
+msgid "Registration can not be performed."
+msgstr ""
+
+#: src/modules/Register.ycp:266
+msgid "Please change the URL and retry."
+msgstr ""
+
+#: src/modules/Register.ycp:267
#, ycp-format
msgid ""
-"The SMT server URL could not be validated as URL.\n"
-"Registration can not be performed. Please modify /etc/suseRegister.conf and run Registration manually.\n"
-"The SMT server URL that was configured was\n"
+"The current registration server URL is\n"
"%1"
msgstr ""
#. translators: this is a heading for an error message - so no punctuation
-#: src/modules/Register.ycp:344
+#: src/modules/Register.ycp:356
msgid "Downloading SMT certificate file failed"
msgstr ""
#. translators: this is a heading for an error message - so no punctuation
-#: src/modules/Register.ycp:367
+#: src/modules/Register.ycp:379
msgid "Could not mount floppy disk"
msgstr ""
#. translators: this is a heading for an error message - so no punctuation
-#: src/modules/Register.ycp:393
+#: src/modules/Register.ycp:405
msgid "Could not read file floppy disk"
msgstr ""
#. translators: this is a heading for an error message - so no punctuation
-#: src/modules/Register.ycp:426
+#: src/modules/Register.ycp:438
msgid "Could find SMT certificate file in local path"
msgstr ""
-#: src/modules/Register.ycp:452
+#: src/modules/Register.ycp:464
msgid "Select SMT certificate file"
msgstr ""
-#: src/modules/Register.ycp:464
+#: src/modules/Register.ycp:476
msgid "Do you really want to cancel and thereby skip the Registration?"
msgstr ""
-#: src/modules/Register.ycp:481
+#: src/modules/Register.ycp:497
msgid "Could not copy certificate file"
msgstr ""
-#: src/modules/Register.ycp:482
+#: src/modules/Register.ycp:498
msgid "Do you want to retry?"
msgstr ""
-#: src/modules/Register.ycp:529
+#: src/modules/Register.ycp:545
msgid "Do you want to trust this certificate?"
msgstr ""
-#: src/modules/Register.ycp:530
+#: src/modules/Register.ycp:546
msgid ""
"This certificate will be used to connect to the SMT server.\n"
"You have to trust this certificate in order to continue with the Registration."
msgstr ""
-#: src/modules/Register.ycp:539
+#: src/modules/Register.ycp:555
msgid "Trust"
msgstr ""
-#: src/modules/Register.ycp:539
+#: src/modules/Register.ycp:555
msgid "Reject"
msgstr ""
-#: src/modules/Register.ycp:567
+#: src/modules/Register.ycp:583
msgid ""
"Installation of the SMT certificates failed.\n"
"Please see the logs for further information."
msgstr ""
+
+#: src/modules/Register.ycp:881
+#, ycp-format
+msgid "Enabled catalog: %1 (%2)"
+msgstr ""
+
+#: src/modules/Register.ycp:887
+#, ycp-format
+msgid "Disabled catalog: %1 (%2)"
+msgstr ""
+
+#: src/modules/Register.ycp:1012
+#, ycp-format
+msgid "Added Source: %1"
+msgstr ""
+
+#: src/modules/Register.ycp:1031
+#, ycp-format
+msgid "Deleted Source: %1"
+msgstr ""
+
+#: src/modules/Register.ycp:1083
+#, ycp-format
+msgid "Added Service: %1"
+msgstr ""
+
+#: src/modules/Register.ycp:1139
+#, ycp-format
+msgid "Deleted Service: %1"
+msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.2/src/clients/inst_suse_register.ycp new/yast2-registration-2.17.3/src/clients/inst_suse_register.ycp
--- old/yast2-registration-2.17.2/src/clients/inst_suse_register.ycp 2008-10-13 18:30:39.000000000 +0200
+++ new/yast2-registration-2.17.3/src/clients/inst_suse_register.ycp 2008-10-14 19:39:24.000000000 +0200
@@ -243,6 +243,9 @@
string details = _("Details...");
string error_msg = _("Error");
string starting_browser = _("Starting browser...");
+ string error_target_init_failed = _("Initialization failed.\nCan not interact with the package system.");
+ string message_install_missing_packages = _("In order to registrer properly the system
+needs to install the following packages.");
/* other string variables */
string information_text = "";
@@ -867,13 +870,12 @@
if ( taskList != $[] )
{
- // add/delete/change repositories
-
string oldMessage = _("Setting up online update source...");
string newMessage = _("Updating software repositories...");
UI::OpenDialog(`VBox(`Label( oldMessage )));
- repoSummary = Register::updateSoftwareRepositories(taskList);
+ // add/delete/change repositories
+ repoSummary = Register::updateSoftwareRepositories(taskList, true);
// #186978 - hide the passwords of the urls in the status window
// now obsolete - the summary created by "updateSoftwareRepositories" will not contain passwords of URLs
@@ -886,13 +888,6 @@
// (#261239) show success popup only on success else error message
if (repoSummary != nil && size(repoSummary) != 0)
{
- // on successful registration and only if there were changes, we need to refresh all sources
- list<integer> currentSources = Pkg::SourceGetCurrent( true );
- foreach (integer srcID, currentSources, {
- y2milestone("Refreshing source with ID: %1", srcID);
- Pkg::SourceForceRefreshNow(srcID);
- });
-
UI::OpenDialog( nccc_success );
repeat
{
@@ -941,8 +936,16 @@
}
+ // error handling - initialization of target failed
+ if ( SRstatus == 113 )
+ {
+ Popup::Message(error_target_init_failed);
+ loopend = true;
+ }
+
+
// handle any other error codes
- if ( contains([0, 1, 3, 101, 198, 199], SRstatus) == false )
+ if ( contains([0, 1, 3, 101, 113, 198, 199], SRstatus) == false )
{
// display error message
error_msg_details = YSR::get_errormsg();
@@ -950,6 +953,15 @@
error_msg_details = "";
}
+/*
+ DOCUMENTATION OF ERROR CODES
+ * 111: a generic unknown error uccurred during a SuseRegister call
+ * 112: the initialization of SuseRegister failed; no special message is used for that though
+ * 113: the initialization if the target failed - no interaction with the package system possible
+ * 198: the system did not find any browser to let the user perform the manual interaction part of the registration
+ * 199: unknown error uccurred (no longer used)
+*/
+
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.2/src/modules/Register.ycp new/yast2-registration-2.17.3/src/modules/Register.ycp
--- old/yast2-registration-2.17.2/src/modules/Register.ycp 2008-10-13 18:59:43.000000000 +0200
+++ new/yast2-registration-2.17.3/src/modules/Register.ycp 2008-10-14 20:38:35.000000000 +0200
@@ -24,7 +24,7 @@
import "YSR";
import "ProductFeatures";
import "SourceManager";
-
+import "Installation";
// --------------------------------------------------------------
// START: Locally defined data
@@ -32,9 +32,11 @@
string services_file = sformat ("%1/update_services", SCR::Read (.target.tmpdir));
boolean isInitializedSR = false;
+boolean isInitializedTarget = false;
map contextDataSR = nil;
map > argsDataSR = nil;
integer initialSRstatus = nil;
+
// ------------------------------------------------------------------
// END: Locally defined data
// ------------------------------------------------------------------
@@ -692,6 +694,7 @@
SCR::Write(.sysconfig.suse_register.SUBMIT_OPTIONAL, sformat("%1", submit_optional ? true:false ));
SCR::Write(.sysconfig.suse_register.SUBMIT_HWDATA, sformat("%1", submit_hwdata ? true:false ));
+ if ( register_regularly == nil ) register_regularly = false;
SCR::Execute(.target.bash, sformat("%1 /var/lib/suseRegister/neverRegisterOnBoot", register_regularly ? "rm -f ":"touch " ));
// touch a flag file for opensuseupdater
SCR::Execute(.target.bash, sformat("touch /var/lib/YaST2/registrationDidRun"));
@@ -939,7 +942,7 @@
* takes a "taskList"-map from SuseRegister and updates the repositories
* @return a list with a small summary (added/deleted/enabled/disabled repos)
*/
-global list<string> updateSoftwareRepositories(map taskList)
+global list<string> updateSoftwareRepositories(map taskList, boolean doRefresh)
{
// see if there are actions to perform
if (taskList == $[])
@@ -1083,9 +1086,8 @@
// ------------------->>>>> FIXME
// need to save service to the system first??
// documentation of Pkg::ServiceRefresh says : "Refresh the service, the service must already be saved on the system!"
-
// is this done with Pkg::SourceSaveAll() ??
- // service != source ??
+ // service != source ??
/*
if ( Pkg::SourceSaveAll() )
{
@@ -1097,9 +1099,8 @@
}
*/
- // then need to call Pkg::ServiceRefresh()
- //if ( Pkg::ServiceRefresh(pService) )
- if (true)
+ // need to call Pkg::ServiceRefresh() before checking the catalogs
+ if ( Pkg::ServiceRefresh(pService) )
{
y2milestone("Successfully refreshed service: %1", pService);
}
@@ -1157,6 +1158,23 @@
});
+ // on successful registration and only if there were changes, we need to refresh all sources
+ if ( size(summary) > 0 )
+ {
+ // save all changes to the sources that we have done
+ Pkg::SourceSaveAll();
+
+ // we can not refresh in autoYaST mode as it may require manual interaction to import keys
+ if ( doRefresh )
+ {
+ list<integer> currentSources = Pkg::SourceGetCurrent( true );
+ foreach (integer srcID, currentSources, {
+ y2milestone("Refreshing source with ID: %1", srcID);
+ Pkg::SourceForceRefreshNow(srcID);
+ });
+ }
+ }
+
return summary;
}
@@ -1192,10 +1210,20 @@
}
- if (! isInitializedSR || contextData != contextDataSR )
+ if ( ! isInitializedSR || ! isInitializedTarget || contextData != contextDataSR )
{
- if ( ! isInitializedSR )
+ // initialize target
+ if ( ! isInitializedTarget )
{
+ string targetRootDir = Mode::normal() ? "/":Installation::destdir;
+ if ( ! Pkg::TargetInitialize(targetRootDir) )
+ {
+ y2error("Initializing the target failed via Pkg::TargetInitialize. No interaction with the package system is possible.");
+ return 113;
+ }
+ y2milestone("Successfully initialized the target.");
+ isInitializedTarget = true;
+
// refresh all sources/services _once_ before interacting with SuseRegister
allCurrentSources = Pkg::SourceStartCache(true);
foreach ( integer srcID, allCurrentSources, {
@@ -1208,7 +1236,16 @@
contextDataSR = contextData;
y2milestone("Initializing SuseRegister with this context data: %1", contextDataSR);
YSR::init_ctx(contextDataSR);
- isInitializedSR = true;
+
+ if ( YSR::get_errorcode() == 0 )
+ {
+ isInitializedSR = true;
+ }
+ else
+ {
+ y2error("Initializing SuseRegister failed with error code (%1) and error message: %2", YSR::get_errorcode(), YSR::get_errormsg());
+ return 112;
+ }
// setting up proxy for SuseRegister
if (Register::use_proxy)
@@ -1276,18 +1313,25 @@
if ( parameter == `autoyast )
{
y2milestone("SuseRegister was called in autoYaST mode. The overall registration satus is: %1", initialSRstatus);
- if ( initialSRstatus == 1 )
+ if ( initialSRstatus == 0 )
+ {
+ y2milestone("Registeration in autoYaST mode succeeded. Now checking the repositories.");
+ // in autoyast mode this must be called from here
+ map taskList = YSR::getTaskList();
+ if ( taskList == $[] )
+ {
+ y2milestone("According to SuseRegister no repositories need to be changed.");
+ }
+ else
+ {
+ updateSoftwareRepositories(taskList, false);
+ }
+ }
+ else if ( initialSRstatus == 1 )
{
y2error("Manual interaction is required for proper registration which is not possible during autoYaST. Please register manually.");
}
- y2milestone("All sources will be refreshed now.");
- // refresh all sources/services
- allCurrentSources = Pkg::SourceStartCache(true);
- foreach ( integer srcID, allCurrentSources, {
- y2milestone("Refreshing source with ID: %1", srcID);
- Pkg::SourceForceRefreshNow(srcID);
- });
}
y2milestone("SuseRegister status: %1", initialSRstatus);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.2/VERSION new/yast2-registration-2.17.3/VERSION
--- old/yast2-registration-2.17.2/VERSION 2008-10-13 18:38:27.000000000 +0200
+++ new/yast2-registration-2.17.3/VERSION 2008-10-14 18:06:13.000000000 +0200
@@ -1 +1 @@
-2.17.2
+2.17.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org