Hello community,
here is the log from the commit of package yast2-installation
checked in at Tue Mar 28 21:57:01 CEST 2006.
--------
--- /work/SRC/noarch/yast2-installation/yast2-installation.changes 2006-03-24 15:17:11.000000000 +0100
+++ /work/src/done/NOARCH/yast2-installation/yast2-installation.changes 2006-03-28 21:48:53.000000000 +0200
@@ -1,0 +2,21 @@
+Tue Mar 28 21:29:07 CEST 2006 - jdsn@suse.de
+
+- added 'rm -f /var/lib/zypp/zmd_updated_the_sources'
+ flag file to be deleted if suse_register runs during installation
+ file checked by online update - deletion requested by mvidner
+- 2.13.51
+
+-------------------------------------------------------------------
+Tue Mar 28 20:53:13 CEST 2006 - jdsn@suse.de
+
+- added autoyast part of suse_register
+- icon for product registration (#160293)
+- fixes for inst_suse_register
+- 2.13.50
+
+-------------------------------------------------------------------
+Mon Mar 27 23:47:38 CEST 2006 - jsrain@suse.de
+
+- removed desktop selection from NLD workflow (#160650)
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.13.49.tar.bz2
New:
----
yast2-installation-2.13.51.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.WIf8pR/_old 2006-03-28 21:52:56.000000000 +0200
+++ /var/tmp/diff_new_pack.WIf8pR/_new 2006-03-28 21:52:56.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.13.49)
+# spec file for package yast2-installation (Version 2.13.51)
#
# 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.49
+Version: 2.13.51
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.13.49.tar.bz2
+Source0: yast2-installation-2.13.51.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.49
+%setup -n yast2-installation-2.13.51
%build
%{prefix}/bin/y2tool y2autoconf
@@ -106,6 +106,18 @@
/usr/X11R6/share/fvwm/
%changelog -n yast2-installation
+* Tue Mar 28 2006 - jdsn@suse.de
+- added 'rm -f /var/lib/zypp/zmd_updated_the_sources'
+ flag file to be deleted if suse_register runs during installation
+ file checked by online update - deletion requested by mvidner
+- 2.13.51
+* Tue Mar 28 2006 - jdsn@suse.de
+- added autoyast part of suse_register
+- icon for product registration (#160293)
+- fixes for inst_suse_register
+- 2.13.50
+* Mon Mar 27 2006 - jsrain@suse.de
+- removed desktop selection from NLD workflow (#160650)
* Fri Mar 24 2006 - locilka@suse.cz
- Filling up list of release_notes urls for all installed products
in the Product.ycp. Needed for internet_test (#160563).
++++++ yast2-installation-2.13.49.tar.bz2 -> yast2-installation-2.13.51.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.49/VERSION new/yast2-installation-2.13.51/VERSION
--- old/yast2-installation-2.13.49/VERSION 2006-03-24 15:15:24.000000000 +0100
+++ new/yast2-installation-2.13.51/VERSION 2006-03-28 21:30:21.000000000 +0200
@@ -1 +1 @@
-2.13.49
+2.13.51
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.49/configure new/yast2-installation-2.13.51/configure
--- old/yast2-installation-2.13.49/configure 2006-03-24 15:52:17.000000000 +0100
+++ new/yast2-installation-2.13.51/configure 2006-03-28 21:43:26.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.49.
+# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.51.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='2.13.49'
-PACKAGE_STRING='yast2-installation 2.13.49'
+PACKAGE_VERSION='2.13.51'
+PACKAGE_STRING='yast2-installation 2.13.51'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
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.49 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.13.51 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.49:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.13.51:";;
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.49
+yast2-installation configure 2.13.51
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.49, which was
+It was created by yast2-installation $as_me 2.13.51, 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.49'
+ VERSION='2.13.51'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.49"
+VERSION="2.13.51"
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.49, which was
+This file was extended by yast2-installation $as_me 2.13.51, 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.49
+yast2-installation config.status 2.13.51
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.49/configure.in new/yast2-installation-2.13.51/configure.in
--- old/yast2-installation-2.13.49/configure.in 2006-03-24 15:52:11.000000000 +0100
+++ new/yast2-installation-2.13.51/configure.in 2006-03-28 21:43:18.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.13.49, http://www.suse.de/feedback, yast2-installation)
+AC_INIT(yast2-installation, 2.13.51, http://www.suse.de/feedback, 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.49"
+VERSION="2.13.51"
RPMNAME="yast2-installation"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.49/control/control.xml new/yast2-installation-2.13.51/control/control.xml
--- old/yast2-installation-2.13.49/control/control.xml 2006-03-24 08:16:43.000000000 +0100
+++ new/yast2-installation-2.13.51/control/control.xml 2006-03-27 16:40:15.000000000 +0200
@@ -21,8 +21,8 @@
false
</globals>
<register>
- false
- false
+ true
+ true
</register>
<software>
true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.49/control.pot new/yast2-installation-2.13.51/control.pot
--- old/yast2-installation-2.13.49/control.pot 2006-03-16 11:19:51.000000000 +0100
+++ new/yast2-installation-2.13.51/control.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,334 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-16 11:19+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: control/control.PROF.glade:59 control/control.PROF.glade:115
-#: control/control.PROF.glade:404 control/control.PROF.glade:444
-#: control/control.SLD.glade:60 control/control.SLD.glade:116
-#: control/control.SLD.glade:405 control/control.SLD.glade:445
-#: control/control.SLES.glade:60 control/control.SLES.glade:103
-#: control/control.SLES.glade:157 control/control.SLES.glade:175
-#: control/control.SLES.glade:510 control/control.SLES.glade:550
-#: control/control.glade:59 control/control.glade:115
-#: control/control.glade:404 control/control.glade:444
-msgid "Installation Settings"
-msgstr ""
-
-#: control/control.PROF.glade:77 control/control.SLD.glade:78
-#: control/control.SLES.glade:78 control/control.SLES.glade:120
-#: control/control.glade:77
-msgid "Overview"
-msgstr ""
-
-#: control/control.PROF.glade:85 control/control.SLD.glade:86
-#: control/control.SLES.glade:86 control/control.SLES.glade:128
-#: control/control.glade:85
-msgid "Expert"
-msgstr ""
-
-#: control/control.PROF.glade:101 control/control.SLD.glade:102
-#: control/control.SLES.glade:143 control/control.glade:101
-msgid "Update Settings"
-msgstr ""
-
-#: control/control.PROF.glade:132 control/control.SLD.glade:133
-#: control/control.SLES.glade:190 control/control.SLES.glade:231
-#: control/control.glade:132
-msgid "Network Configuration"
-msgstr ""
-
-#: control/control.PROF.glade:172 control/control.PROF.glade:620
-#: control/control.PROF.glade:625 control/control.PROF.glade:629
-#: control/control.SLD.glade:173 control/control.SLD.glade:621
-#: control/control.SLD.glade:626 control/control.SLD.glade:630
-#: control/control.SLES.glade:264 control/control.SLES.glade:275
-#: control/control.SLES.glade:284 control/control.SLES.glade:737
-#: control/control.SLES.glade:742 control/control.SLES.glade:746
-#: control/control.glade:172 control/control.glade:620
-#: control/control.glade:625 control/control.glade:629
-msgid "Hardware Configuration"
-msgstr ""
-
-#: control/control.PROF.glade:191 control/control.PROF.glade:287
-#: control/control.PROF.glade:375 control/control.SLD.glade:192
-#: control/control.SLD.glade:288 control/control.SLD.glade:376
-#: control/control.SLES.glade:303 control/control.SLES.glade:393
-#: control/control.SLES.glade:481 control/control.glade:191
-#: control/control.glade:287 control/control.glade:375
-msgid "Preparation"
-msgstr ""
-
-#: control/control.PROF.glade:197 control/control.PROF.glade:206
-#: control/control.PROF.glade:293 control/control.PROF.glade:302
-#: control/control.PROF.glade:399 control/control.PROF.glade:439
-#: control/control.SLD.glade:198 control/control.SLD.glade:207
-#: control/control.SLD.glade:294 control/control.SLD.glade:303
-#: control/control.SLD.glade:400 control/control.SLD.glade:440
-#: control/control.SLES.glade:309 control/control.SLES.glade:318
-#: control/control.SLES.glade:399 control/control.SLES.glade:408
-#: control/control.SLES.glade:505 control/control.SLES.glade:545
-#: control/control.glade:197 control/control.glade:206
-#: control/control.glade:293 control/control.glade:302
-#: control/control.glade:399 control/control.glade:439
-msgid "Language"
-msgstr ""
-
-#: control/control.PROF.glade:212 control/control.PROF.glade:308
-#: control/control.SLD.glade:213 control/control.SLD.glade:309
-#: control/control.SLES.glade:324 control/control.SLES.glade:414
-#: control/control.glade:212 control/control.glade:308
-msgid "License Agreement"
-msgstr ""
-
-#: control/control.PROF.glade:218 control/control.PROF.glade:314
-#: control/control.SLD.glade:219 control/control.SLD.glade:315
-#: control/control.SLES.glade:330 control/control.SLES.glade:420
-#: control/control.glade:218 control/control.glade:314
-msgid "Disk Activation"
-msgstr ""
-
-#: control/control.PROF.glade:224 control/control.PROF.glade:320
-#: control/control.SLD.glade:225 control/control.SLD.glade:321
-#: control/control.SLES.glade:336 control/control.SLES.glade:426
-#: control/control.glade:224 control/control.glade:320
-msgid "System Analysis"
-msgstr ""
-
-#: control/control.PROF.glade:230 control/control.PROF.glade:332
-#: control/control.SLD.glade:231 control/control.SLD.glade:333
-#: control/control.SLES.glade:342 control/control.SLES.glade:438
-#: control/control.glade:230 control/control.glade:332
-msgid "Add-On Products"
-msgstr ""
-
-#: control/control.PROF.glade:236 control/control.SLD.glade:237
-#: control/control.SLES.glade:348 control/control.glade:236
-msgid "Time Zone"
-msgstr ""
-
-#: control/control.PROF.glade:245 control/control.SLD.glade:246
-#: control/control.glade:245
-msgid "Desktop Selection"
-msgstr ""
-
-#: control/control.PROF.glade:252 control/control.SLD.glade:253
-#: control/control.SLES.glade:358 control/control.glade:252
-msgid "Installation"
-msgstr ""
-
-#: control/control.PROF.glade:255 control/control.SLD.glade:256
-#: control/control.SLES.glade:361 control/control.glade:255
-msgid "Installation Summary"
-msgstr ""
-
-#: control/control.PROF.glade:260 control/control.PROF.glade:266
-#: control/control.PROF.glade:270 control/control.PROF.glade:274
-#: control/control.PROF.glade:278 control/control.PROF.glade:409
-#: control/control.PROF.glade:415 control/control.PROF.glade:419
-#: control/control.PROF.glade:423 control/control.PROF.glade:449
-#: control/control.PROF.glade:455 control/control.PROF.glade:459
-#: control/control.PROF.glade:463 control/control.PROF.glade:550
-#: control/control.PROF.glade:554 control/control.PROF.glade:558
-#: control/control.PROF.glade:662 control/control.PROF.glade:666
-#: control/control.PROF.glade:670 control/control.PROF.glade:674
-#: control/control.PROF.glade:678 control/control.PROF.glade:693
-#: control/control.PROF.glade:697 control/control.PROF.glade:701
-#: control/control.PROF.glade:705 control/control.SLD.glade:261
-#: control/control.SLD.glade:267 control/control.SLD.glade:271
-#: control/control.SLD.glade:275 control/control.SLD.glade:279
-#: control/control.SLD.glade:410 control/control.SLD.glade:416
-#: control/control.SLD.glade:420 control/control.SLD.glade:424
-#: control/control.SLD.glade:450 control/control.SLD.glade:456
-#: control/control.SLD.glade:460 control/control.SLD.glade:464
-#: control/control.SLD.glade:551 control/control.SLD.glade:555
-#: control/control.SLD.glade:559 control/control.SLD.glade:663
-#: control/control.SLD.glade:667 control/control.SLD.glade:671
-#: control/control.SLD.glade:675 control/control.SLD.glade:679
-#: control/control.SLD.glade:694 control/control.SLD.glade:698
-#: control/control.SLD.glade:702 control/control.SLD.glade:706
-#: control/control.SLES.glade:366 control/control.SLES.glade:372
-#: control/control.SLES.glade:376 control/control.SLES.glade:380
-#: control/control.SLES.glade:384 control/control.SLES.glade:515
-#: control/control.SLES.glade:521 control/control.SLES.glade:525
-#: control/control.SLES.glade:529 control/control.SLES.glade:555
-#: control/control.SLES.glade:561 control/control.SLES.glade:565
-#: control/control.SLES.glade:569 control/control.SLES.glade:650
-#: control/control.SLES.glade:654 control/control.SLES.glade:658
-#: control/control.SLES.glade:779 control/control.SLES.glade:783
-#: control/control.SLES.glade:787 control/control.SLES.glade:791
-#: control/control.SLES.glade:795 control/control.SLES.glade:810
-#: control/control.SLES.glade:814 control/control.SLES.glade:818
-#: control/control.SLES.glade:822 control/control.glade:260
-#: control/control.glade:266 control/control.glade:270
-#: control/control.glade:274 control/control.glade:278
-#: control/control.glade:409 control/control.glade:415
-#: control/control.glade:419 control/control.glade:423
-#: control/control.glade:449 control/control.glade:455
-#: control/control.glade:459 control/control.glade:463
-#: control/control.glade:550 control/control.glade:554
-#: control/control.glade:558 control/control.glade:662
-#: control/control.glade:666 control/control.glade:670
-#: control/control.glade:674 control/control.glade:678
-#: control/control.glade:693 control/control.glade:697
-#: control/control.glade:701 control/control.glade:705
-msgid "Perform Installation"
-msgstr ""
-
-#: control/control.PROF.glade:326 control/control.SLD.glade:327
-#: control/control.SLES.glade:432 control/control.glade:326
-msgid "System for Update"
-msgstr ""
-
-#: control/control.PROF.glade:339 control/control.SLD.glade:340
-#: control/control.SLES.glade:445 control/control.glade:339
-msgid "Update"
-msgstr ""
-
-#: control/control.PROF.glade:342 control/control.SLD.glade:343
-#: control/control.SLES.glade:448 control/control.glade:342
-msgid "Update Summary"
-msgstr ""
-
-#: control/control.PROF.glade:347 control/control.PROF.glade:353
-#: control/control.PROF.glade:357 control/control.PROF.glade:361
-#: control/control.PROF.glade:365 control/control.PROF.glade:478
-#: control/control.PROF.glade:482 control/control.SLD.glade:348
-#: control/control.SLD.glade:354 control/control.SLD.glade:358
-#: control/control.SLD.glade:362 control/control.SLD.glade:366
-#: control/control.SLD.glade:479 control/control.SLD.glade:483
-#: control/control.SLES.glade:453 control/control.SLES.glade:459
-#: control/control.SLES.glade:463 control/control.SLES.glade:467
-#: control/control.SLES.glade:471 control/control.SLES.glade:584
-#: control/control.SLES.glade:588 control/control.glade:347
-#: control/control.glade:353 control/control.glade:357
-#: control/control.glade:361 control/control.glade:365
-#: control/control.glade:478 control/control.glade:482
-msgid "Perform Update"
-msgstr ""
-
-#: control/control.PROF.glade:379 control/control.SLD.glade:380
-#: control/control.SLES.glade:485 control/control.glade:379
-msgid "System Information"
-msgstr ""
-
-#: control/control.PROF.glade:383 control/control.SLD.glade:384
-#: control/control.SLES.glade:489 control/control.glade:383
-msgid "Perform Repair"
-msgstr ""
-
-#: control/control.PROF.glade:393 control/control.PROF.glade:433
-#: control/control.PROF.glade:636 control/control.SLD.glade:394
-#: control/control.SLD.glade:434 control/control.SLD.glade:637
-#: control/control.SLES.glade:499 control/control.SLES.glade:539
-#: control/control.SLES.glade:753 control/control.glade:393
-#: control/control.glade:433 control/control.glade:636
-msgid "Base Installation"
-msgstr ""
-
-#: control/control.PROF.glade:487 control/control.PROF.glade:565
-#: control/control.PROF.glade:710 control/control.SLD.glade:488
-#: control/control.SLD.glade:566 control/control.SLD.glade:711
-#: control/control.SLES.glade:593 control/control.SLES.glade:665
-#: control/control.SLES.glade:827 control/control.glade:487
-#: control/control.glade:565 control/control.glade:710
-msgid "Configuration"
-msgstr ""
-
-#: control/control.PROF.glade:490 control/control.PROF.glade:496
-#: control/control.PROF.glade:577 control/control.PROF.glade:582
-#: control/control.PROF.glade:586 control/control.PROF.glade:590
-#: control/control.SLD.glade:491 control/control.SLD.glade:497
-#: control/control.SLD.glade:578 control/control.SLD.glade:583
-#: control/control.SLD.glade:587 control/control.SLD.glade:591
-#: control/control.SLES.glade:596 control/control.SLES.glade:602
-#: control/control.SLES.glade:677 control/control.SLES.glade:682
-#: control/control.SLES.glade:686 control/control.SLES.glade:690
-#: control/control.glade:490 control/control.glade:496
-#: control/control.glade:577 control/control.glade:582
-#: control/control.glade:586 control/control.glade:590
-msgid "Network"
-msgstr ""
-
-#: control/control.PROF.glade:502 control/control.SLD.glade:503
-#: control/control.SLES.glade:694 control/control.glade:502
-msgid "Update Configuration"
-msgstr ""
-
-#: control/control.PROF.glade:508 control/control.PROF.glade:514
-#: control/control.PROF.glade:520 control/control.PROF.glade:594
-#: control/control.PROF.glade:598 control/control.SLD.glade:509
-#: control/control.SLD.glade:515 control/control.SLD.glade:521
-#: control/control.SLD.glade:595 control/control.SLD.glade:599
-#: control/control.SLES.glade:608 control/control.SLES.glade:614
-#: control/control.SLES.glade:620 control/control.SLES.glade:700
-#: control/control.SLES.glade:706 control/control.SLES.glade:710
-#: control/control.glade:508 control/control.glade:514
-#: control/control.glade:520 control/control.glade:594
-#: control/control.glade:598
-msgid "Online Update"
-msgstr ""
-
-#: control/control.PROF.glade:524 control/control.PROF.glade:610
-#: control/control.PROF.glade:717 control/control.SLD.glade:525
-#: control/control.SLD.glade:611 control/control.SLD.glade:718
-#: control/control.SLES.glade:624 control/control.SLES.glade:727
-#: control/control.SLES.glade:834 control/control.glade:524
-#: control/control.glade:610 control/control.glade:717
-msgid "Clean Up"
-msgstr ""
-
-#: control/control.PROF.glade:528 control/control.PROF.glade:616
-#: control/control.SLD.glade:529 control/control.SLD.glade:617
-#: control/control.SLES.glade:628 control/control.SLES.glade:733
-#: control/control.glade:528 control/control.glade:616
-msgid "Release Notes"
-msgstr ""
-
-#: control/control.PROF.glade:568 control/control.SLD.glade:569
-#: control/control.SLES.glade:668 control/control.glade:568
-msgid "Hostname"
-msgstr ""
-
-#: control/control.PROF.glade:573 control/control.SLD.glade:574
-#: control/control.SLES.glade:673 control/control.glade:573
-msgid "Root Password"
-msgstr ""
-
-#: control/control.PROF.glade:602 control/control.PROF.glade:606
-#: control/control.SLD.glade:603 control/control.SLD.glade:607
-#: control/control.SLES.glade:719 control/control.SLES.glade:723
-#: control/control.glade:602 control/control.glade:606
-msgid "Users"
-msgstr ""
-
-#: control/control.PROF.glade:645 control/control.PROF.glade:651
-#: control/control.PROF.glade:655 control/control.SLD.glade:646
-#: control/control.SLD.glade:652 control/control.SLD.glade:656
-#: control/control.SLES.glade:762 control/control.SLES.glade:768
-#: control/control.SLES.glade:772 control/control.glade:645
-#: control/control.glade:651 control/control.glade:655
-msgid "AutoYaST Settings"
-msgstr ""
-
-#: control/control.PROF.glade:713 control/control.SLD.glade:714
-#: control/control.SLES.glade:830 control/control.glade:713
-msgid "System Configuration"
-msgstr ""
-
-#: control/control.SLES.glade:714
-msgid "Service"
-msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.49/installation.pot new/yast2-installation-2.13.51/installation.pot
--- old/yast2-installation-2.13.49/installation.pot 2006-03-24 09:27:40.000000000 +0100
+++ new/yast2-installation-2.13.51/installation.pot 2006-03-28 20:57:05.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-24 01:27-0700\n"
+"POT-Creation-Date: 2006-03-28 20:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -721,103 +721,110 @@
msgstr ""
#. strings for main (wizard) layout
-#: src/clients/inst_suse_register.ycp:49
+#. Transltors: This is title/brand - only translate the Configuration
+#: src/clients/inst_suse_register.ycp:51
msgid "Novell Customer Center Configuration"
msgstr ""
-#: src/clients/inst_suse_register.ycp:50
+#: src/clients/inst_suse_register.ycp:52
msgid "Update Configuration"
msgstr ""
-#: src/clients/inst_suse_register.ycp:55
+#: src/clients/inst_suse_register.ycp:58
msgid ""
"Get technical support and product updates and\n"
"manage subscriptions with Novell Customer Center."
msgstr ""
-#: src/clients/inst_suse_register.ycp:61
+#: src/clients/inst_suse_register.ycp:64
msgid "Configure Now (Recommended)"
msgstr ""
-#: src/clients/inst_suse_register.ycp:62
+#: src/clients/inst_suse_register.ycp:65
msgid "Configure Later"
msgstr ""
-#: src/clients/inst_suse_register.ycp:64
+#: src/clients/inst_suse_register.ycp:67
msgid "Include for Convenience"
msgstr ""
-#: src/clients/inst_suse_register.ycp:65
+#. Translators: Text for UI Label - capitalized
+#: src/clients/inst_suse_register.ycp:68
+#: src/clients/suse_register_auto.ycp:198
msgid "Hardware Profile"
msgstr ""
-#: src/clients/inst_suse_register.ycp:66
+#. Translators: Text for UI Label - capitalized
+#: src/clients/inst_suse_register.ycp:69
+#: src/clients/suse_register_auto.ycp:200
msgid "Optional Information"
msgstr ""
-#: src/clients/inst_suse_register.ycp:67
-#: src/clients/inst_suse_register.ycp:145
+#: src/clients/inst_suse_register.ycp:70
+#: src/clients/inst_suse_register.ycp:151
msgid "Details..."
msgstr ""
#. strings for success popup
-#: src/clients/inst_suse_register.ycp:71
+#: src/clients/inst_suse_register.ycp:74
msgid "Your configuration was successful."
msgstr ""
#. strings for manual interaction popup
-#: src/clients/inst_suse_register.ycp:75
+#: src/clients/inst_suse_register.ycp:78
msgid "Manual Interaction Required"
msgstr ""
-#: src/clients/inst_suse_register.ycp:76
+#: src/clients/inst_suse_register.ycp:79
msgid "Needed Information"
msgstr ""
-#: src/clients/inst_suse_register.ycp:77
+#: src/clients/inst_suse_register.ycp:80
msgid "Continue"
msgstr ""
-#: src/clients/inst_suse_register.ycp:79
+#: src/clients/inst_suse_register.ycp:82
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:85
+#: src/clients/inst_suse_register.ycp:88
msgid "Registration and Privacy Information"
msgstr ""
-#: src/clients/inst_suse_register.ycp:89
+#: src/clients/inst_suse_register.ycp:92
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:94
+#: src/clients/inst_suse_register.ycp:97
msgid "Update Source Issues"
msgstr ""
-#: src/clients/inst_suse_register.ycp:96
+#: src/clients/inst_suse_register.ycp:99
msgid ""
"Registering as a regular user does not include the update source\n"
-"in YaST Online Update (YOU). To include the source automatically,\n"
-"register as root.\n"
-"Otherwise use other update tools or add the source to YOU manually."
+"in the Online Update YaST module. If you continue and later want \n"
+"to update with Online Update, the source must be added manually.\n"
+"Other tools, such as Software Updater in the panel, can still be \n"
+"used. Alternatively, cancel then register through YaST as root \n"
+"so the sources are available to all tools."
msgstr ""
#. error messages
-#: src/clients/inst_suse_register.ycp:104
+#: src/clients/inst_suse_register.ycp:110
msgid "Error: Recieved data is invalid."
msgstr ""
-#: src/clients/inst_suse_register.ycp:105
+#: src/clients/inst_suse_register.ycp:111
msgid "Error: Could not retrieve data."
msgstr ""
-#: src/clients/inst_suse_register.ycp:111
+#: src/clients/inst_suse_register.ycp:117
msgid ""
"<p>\n"
"Configure your system to enable online updates by registering it with Novell.\n"
@@ -826,7 +833,7 @@
"</p>"
msgstr ""
-#: src/clients/inst_suse_register.ycp:119
+#: src/clients/inst_suse_register.ycp:125
msgid ""
"<p>\n"
"To simplify the registration process, include information from your system\n"
@@ -838,7 +845,7 @@
"</p>"
msgstr ""
-#: src/clients/inst_suse_register.ycp:130
+#: src/clients/inst_suse_register.ycp:136
msgid ""
"<p>\n"
"No information is passed to anyone outside Novell. The data is used for\n"
@@ -849,23 +856,23 @@
msgstr ""
#. further strings
-#: src/clients/inst_suse_register.ycp:142
+#: src/clients/inst_suse_register.ycp:148
msgid "Checking..."
msgstr ""
-#: src/clients/inst_suse_register.ycp:143
+#: src/clients/inst_suse_register.ycp:149
msgid "Error"
msgstr ""
-#: src/clients/inst_suse_register.ycp:144
+#: src/clients/inst_suse_register.ycp:150
msgid "An error occurred while connecting to the server."
msgstr ""
-#: src/clients/inst_suse_register.ycp:146
+#: src/clients/inst_suse_register.ycp:152
msgid "Error Message"
msgstr ""
-#: src/clients/inst_suse_register.ycp:147
+#: src/clients/inst_suse_register.ycp:153
msgid "Starting Browser..."
msgstr ""
@@ -1177,6 +1184,106 @@
msgid "Copying SSH settings to installed system..."
msgstr ""
+#. Translators: Heading - capitalized
+#: src/clients/suse_register_auto.ycp:64
+#: src/clients/suse_register_auto.ycp:176
+msgid "Product Registration"
+msgstr ""
+
+#. Translators: Text in a sentece-like environment - normal capitalization
+#: src/clients/suse_register_auto.ycp:66
+msgid "Run during autoinstallation"
+msgstr ""
+
+#: src/clients/suse_register_auto.ycp:66
+msgid "Do not run during autoinstallation"
+msgstr ""
+
+#. Translators: Sentence-like text for singular and plural (incl. zero) of items
+#: src/clients/suse_register_auto.ycp:70
+msgid "1 item of registration data"
+msgstr ""
+
+#: src/clients/suse_register_auto.ycp:70
+#, ycp-format
+msgid "%1 items of registration data"
+msgstr ""
+
+#: src/clients/suse_register_auto.ycp:74
+msgid "Included Information"
+msgstr ""
+
+#. Translators: Text in a sentece-like environment - normal capitalization
+#: src/clients/suse_register_auto.ycp:77
+msgid "Hardware profile"
+msgstr ""
+
+#. Translators: Text in a sentece-like environment - normal capitalization
+#: src/clients/suse_register_auto.ycp:79
+msgid "Optional information"
+msgstr ""
+
+#. TextEntry label
+#: src/clients/suse_register_auto.ycp:128
+msgid "&Key"
+msgstr ""
+
+#. TextEntry label
+#: src/clients/suse_register_auto.ycp:130
+msgid "&Value"
+msgstr ""
+
+#: src/clients/suse_register_auto.ycp:157
+msgid "Key is invalid."
+msgstr ""
+
+#: src/clients/suse_register_auto.ycp:179
+msgid "<p>Product registration includes your product in Novell's database, enabling you to get online updates and technical support. To register while installing automatically, select <b>Run Product Registration</b>. To simplify the procedure, include information from your system with <b>Hardware Profile</b> and <b>Optional Information</b>.</p>"
+msgstr ""
+
+#: src/clients/suse_register_auto.ycp:182
+msgid "<p>Get more information about the registration process with <tt>suse_register -h</tt>.</p>"
+msgstr ""
+
+#: src/clients/suse_register_auto.ycp:185
+msgid "<p>Other information used for registration is shown in <b>Registration Data</b>. Add a new key and value pair by pressing <b>Add</b> then entering the appropriate values. These parameters are those that can be passed with <tt>suse_register -a</tt>. Get more information about them with <tt>suse_register -p</tt>. Remove a pair with <b>Delete</b> or modify an existing pair with <b>Edit</b>.</p>"
+msgstr ""
+
+#. Translators: Text for UI Label - capitalized
+#: src/clients/suse_register_auto.ycp:193
+msgid "Run Product Registration"
+msgstr ""
+
+#. Translators: Text for UI Label - capitalized
+#: src/clients/suse_register_auto.ycp:196
+msgid "Include in Registration"
+msgstr ""
+
+#. Translators: Text for UI Label - capitalized
+#: src/clients/suse_register_auto.ycp:205
+msgid "Registration Data to Use"
+msgstr ""
+
+#: src/clients/suse_register_auto.ycp:206
+msgid "Key"
+msgstr ""
+
+#: src/clients/suse_register_auto.ycp:206
+msgid "Value"
+msgstr ""
+
+#: src/clients/suse_register_auto.ycp:208
+msgid "Ad&d"
+msgstr ""
+
+#: src/clients/suse_register_auto.ycp:209
+msgid "&Edit"
+msgstr ""
+
+#: src/clients/suse_register_auto.ycp:210
+msgid "De&lete"
+msgstr ""
+
#. progress step title
#: src/clients/switch_scr_finish.ycp:42
msgid "Moving to installed system..."
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.49/src/clients/inst_suse_register.ycp new/yast2-installation-2.13.51/src/clients/inst_suse_register.ycp
--- old/yast2-installation-2.13.49/src/clients/inst_suse_register.ycp 2006-03-24 08:16:43.000000000 +0100
+++ new/yast2-installation-2.13.51/src/clients/inst_suse_register.ycp 2006-03-28 20:19:33.000000000 +0200
@@ -46,11 +46,14 @@
map argmap = GetInstArgs::argmap();
/* strings for main (wizard) layout */
+
+ // Transltors: This is title/brand - only translate the Configuration
string title_nccc = _("Novell Customer Center Configuration");
string title_update = _("Update Configuration");
// for SLES/SLED and SL (2 months after release) use title_nccc
string title = title_update;
+ // Translators: limit to 2x 50 charachters - if more needed take 3x 50 chars but NOTHING more
string nccc_top = _(
"Get technical support and product updates and
manage subscriptions with Novell Customer Center."
@@ -94,12 +97,15 @@
string nonroot_title = _("Update Source Issues");
string nonroot_message = _(
"Registering as a regular user does not include the update source
-in YaST Online Update (YOU). To include the source automatically,
-register as root.
-Otherwise use other update tools or add the source to YOU manually."
+in the Online Update YaST module. If you continue and later want
+to update with Online Update, the source must be added manually.
+Other tools, such as Software Updater in the panel, can still be
+used. Alternatively, cancel then register through YaST as root
+so the sources are available to all tools."
);
+
/* error messages */
string data_invalid = _("Error: Recieved data is invalid.");
string retrieve_error = _("Error: Could not retrieve data.");
@@ -202,8 +208,8 @@
/* vv MANUAL INTERACTION POPUP vv */
- term manual_interaction = `HBox(
- `MinSize( 50, 20, `VBox(
+ term manual_interaction = //`HBox(
+ `MinSize( 65, 25, `HBox( `VBox(
`Left( `Label( `opt(`boldFont), mi_required ) ) ,
`VSpacing(0.5) ,
`Left( `Label( mi_start_browser ) ) ,
@@ -503,6 +509,9 @@
{
if ( configure_status == true )
{
+ // remove the zmd flag file (requested by mvidner)
+ SCR::Execute(.target.bash, " rm -f /var/lib/zypp/zmd_updated_the_sources " );
+
/* run suse_register to see if we need manual interaction */
information_data = Register::suseRegister(nil);
@@ -528,6 +537,7 @@
// now we launch the browser
UI::ChangeWidget( `id(`needinfo), `Value, starting_browser );
launchBrowser(information_data["stdout"]:"http://www.opensuse.org");
+ // FIXME: probably this line can be dropped - see FIXME below; drop with SP1 probably
Register::submit_optional = false; // deactivate after each browser run
}
else if ( mi_ret == `cancel )
@@ -629,7 +639,8 @@
if (configure_status) UI::ChangeWidget(`id(`configure), `Value, true);
else UI::ChangeWidget(`id(`noconfigure), `Value, true);
- //FIXME: probably these two lines can be dropped if decided not to change these values after first suse_register call
+ //FIXME: probably these two lines can be dropped (see FIXME above as well)
+ // if decided not to change these values after first suse_register call; probably drop for SP1
UI::ChangeWidget( `id(`hwinfo ), `Value, Register::submit_hwdata );
UI::ChangeWidget( `id(`optional ), `Value, Register::submit_optional );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.49/src/clients/suse_register_auto.ycp new/yast2-installation-2.13.51/src/clients/suse_register_auto.ycp
--- old/yast2-installation-2.13.49/src/clients/suse_register_auto.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.13.51/src/clients/suse_register_auto.ycp 2006-03-27 16:50:19.000000000 +0200
@@ -0,0 +1,416 @@
+/**
+ * File: suse_register_auto
+ * Module: Installation
+ * Summary: Configure Product Registration for Autoinstallation
+ * Authors: J. Daniel Schmidt
+ *
+ * Configure Product Registration for Autoinstallation
+ *
+ * $Id: suse_register_auto.ycp 1 2006-03-27 13:20:02Z jdsn $
+ */
+
+
+{
+
+textdomain "installation";
+
+import "Register";
+import "Wizard";
+import "Label";
+import "Progress";
+import "Report";
+import "Summary";
+import "Popup";
+import "String";
+
+
+/**
+ * Get all settings from the first parameter
+ * (For use by autoinstallation.)
+ * @param settings The YCP structure to be imported.
+ * @return boolean True on success
+ */
+boolean Import (map settings)
+{
+ y2debug("Import called, settings: %1", settings);
+ return Register::Import(settings);
+}
+
+
+/**
+ * Export the settings to a single map
+ * (For use by autoinstallation.)
+ */
+
+map Export ()
+{
+ y2debug("Export called");
+ return Register::Export();
+}
+
+
+/**
+ * Create a textual summary and a list of unconfigured cards
+ * @return summary of the current configuration
+ */
+string Summary()
+{
+ //Register::do_registration=false;
+ //Register::submit_optional=true;
+ //Register::submit_hwdata=true;
+ string summary = "";
+
+ // Translators: Heading - capitalized
+ summary = Summary::AddHeader (summary,_("Product Registration"));
+ // Translators: Text in a sentece-like environment - normal capitalization
+ summary = Summary::AddLine (summary, Register::do_registration ? _("Run during autoinstallation"):_("Do not run during autoinstallation"));
+
+ integer items_count = size (Register::registration_data);
+ // Translators: Sentence-like text for singular and plural (incl. zero) of items
+ string items_msg = items_count == 1 ? _("1 item of registration data"):sformat(_("%1 items of registration data"), items_count);
+
+ if ( Register::do_registration )
+ {
+ summary = Summary::AddHeader (summary, _("Included Information") );
+ summary = Summary::OpenList(summary);
+ // Translators: Text in a sentece-like environment - normal capitalization
+ summary = Summary::AddListItem (summary, Register::submit_hwdata ? _("Hardware profile"):"");
+ // Translators: Text in a sentece-like environment - normal capitalization
+ summary = Summary::AddListItem (summary,Register::submit_optional ? _("Optional information"):"");
+ summary = Summary::AddListItem (summary, items_msg );
+ summary = Summary::CloseList(summary);
+ }
+
+ return summary;
+}
+
+/**
+ * Write all settings
+ * @return true on success
+ */
+boolean Write()
+{
+ return Register::Write();
+}
+
+
+void Read()
+{
+ Register::Read();
+}
+
+map AutoPackages()
+{
+ return $[ "install":[], "remove":[] ];
+}
+
+
+
+/* --------------------------------------------------------- */
+
+
+/**
+ * Host edit dialog
+ * @param id id of the edited host
+ * @param entry edited entry
+ * @param forbidden already used IP addresses
+ * @return host or nil, if canceled
+ */
+define term KeyValueDialog(integer id, term entry) {
+
+ y2debug("KeyValueDialog: id: %1", id);
+ y2debug("KeyValueDialog: entry: %1", entry);
+
+ UI::OpenDialog(`opt(`decorated),`VBox(
+ `HSpacing(1),
+ `VBox(
+ /* TextEntry label */
+ `TextEntry(`id(`key), _("&Key"), entry[1]:""),
+ /* TextEntry label */
+ `TextEntry(`id(`value), _("&Value"), entry[2]:"")
+ ),
+ `HSpacing(1),
+ `HBox(
+ `PushButton(`id(`ok), `opt(`default), Label::OKButton()),
+ `PushButton(`id(`cancel), Label::CancelButton())
+ )
+ ));
+
+ if(entry == `empty())
+ UI::SetFocus(`id(`key));
+ else
+ UI::SetFocus(`id(`value));
+
+ any ret = nil;
+ term newentry = nil;
+
+ repeat
+ {
+ ret = UI::UserInput();
+ if(ret != `ok) break;
+
+ string key = (string) UI::QueryWidget(`id(`key), `Value);
+ string value = (string) UI::QueryWidget(`id(`value), `Value);
+ key = String::CutRegexMatch(key, "[^A-Za-z0-9_-]+", true );
+ if (key == "")
+ {
+ Popup::Notify(_("Key is invalid."));
+ UI::ChangeWidget(`id(`key), `Value, key);
+ ret=nil;
+ }
+ newentry = `item(`id(id), key, value);
+
+ } until (ret == `ok || ret == `cancel);
+
+ UI::CloseDialog();
+ if(ret != `ok) return nil;
+ return newentry;
+}
+
+/* --------------------------------------------------------- */
+/* --------------------------------------------------------- */
+
+
+symbol suse_register_configuration()
+{
+ string caption = _("Product Registration");
+ string help_text_caption = sformat("<p><b>%1</b></p>", caption);
+ string help_text_para1 = _(
+"<p>Product registration includes your product in Novell's database, enabling you to get online updates and technical support. To register while installing automatically, select <b>Run Product Registration</b>. To simplify the procedure, include information from your system with <b>Hardware Profile</b> and <b>Optional Information</b>.</p>"
+);
+ string help_text_para2 = _(
+"<p>Get more information about the registration process with <tt>suse_register -h</tt>.</p>"
+);
+ string help_text_para3 = _(
+"<p>Other information used for registration is shown in <b>Registration Data</b>. Add a new key and value pair by pressing <b>Add</b> then entering the appropriate values. These parameters are those that can be passed with <tt>suse_register -a</tt>. Get more information about them with <tt>suse_register -p</tt>. Remove a pair with <b>Delete</b> or modify an existing pair with <b>Edit</b>.</p>"
+);
+
+ string help_text = help_text_caption + help_text_para1 + help_text_para2 + help_text_para3;
+
+ term contents = `VBox(
+ `VBox (
+ // Translators: Text for UI Label - capitalized
+ `Left( `CheckBox(`id(`run), `opt(`notify), _("Run Product Registration"), false )),
+ `HBox( `HSpacing (3.0) , `VBox(
+ // Translators: Text for UI Label - capitalized
+ `Left( `Label( _("Include in Registration") ) ),
+ // Translators: Text for UI Label - capitalized
+ `Left( `CheckBox(`id(`sub_hw), `opt(`notify), _("Hardware Profile"), false )),
+ // Translators: Text for UI Label - capitalized
+ `Left( `CheckBox(`id(`sub_opt), `opt(`notify), _("Optional Information"), false ))
+ ))
+ ),
+ `VBox ( `VSpacing(0.5),
+ // Translators: Text for UI Label - capitalized
+ `Left( `Label( _("Registration Data to Use")) ),
+ `MinSize(10,5, `Table( `id(`table), `opt(`notify, `vstretch) , `header( _("Key"), _("Value")), [] )),
+ `HBox(
+ `PushButton(`id(`add), _("Ad&d")),
+ `PushButton(`id(`edit), `opt(`disabled), _("&Edit")),
+ `PushButton(`id(`delete), `opt(`disabled), _("De&lete"))
+ ),
+ `VSpacing(0.5)
+ )
+ );
+
+
+ Wizard::CreateDialog();
+ Wizard::SetContents (caption, contents, help_text, false, true);
+ Wizard::SetNextButton(`next, Label::FinishButton() );
+
+ list<term> table_items=[];
+ integer mycount=0;
+ // restore table items
+ foreach(string key, string value, Register::registration_data,
+ {
+ table_items = add(table_items, (term)`item(`id(mycount), key, value ) );
+ mycount = mycount+1;
+ });
+
+ // get current changes
+ UI::ChangeWidget(`id(`table), `Items, table_items);
+ UI::ChangeWidget(`id(`run), `Value, Register::do_registration);
+ UI::ChangeWidget(`id(`sub_hw ), `Value, Register::submit_hwdata);
+ UI::ChangeWidget(`id(`sub_opt), `Value, Register::submit_optional);
+ integer items=size(table_items);
+ UI::ChangeWidget(`id(`edit), `Enabled, items > 0);
+ UI::ChangeWidget(`id(`delete), `Enabled, items > 0);
+
+ symbol ret = nil;
+
+ repeat
+ {
+ ret = (symbol)UI::UserInput();
+
+ if (ret == `run || ret == `sub_hw || ret == `sub_opt)
+ {
+ Register::do_registration = (boolean) UI::QueryWidget(`id(`run), `Value );
+ Register::submit_hwdata = (boolean) UI::QueryWidget(`id(`sub_hw), `Value);
+ Register::submit_optional = (boolean) UI::QueryWidget(`id(`sub_opt), `Value);
+
+ y2debug("do_registration: %1", Register::do_registration);
+ y2debug("submit_hwdata: %1", Register::submit_hwdata);
+ y2debug("submit_optional: %1", Register::submit_optional);
+ }
+ else if (ret == `edit || ret == `table)
+ {
+ integer cur = (integer) UI::QueryWidget(`id(`table), `CurrentItem);
+ list<term> cur_item = filter(term e, table_items, {
+ return cur == e[0, 0]:nil;
+ });
+
+ term newitem = KeyValueDialog(cur, cur_item[0]:nil);
+ if (newitem == nil) continue;
+ else
+ {
+ table_items = maplist(term e, table_items,
+ {
+ if (cur == e[0,0]:-1) return newitem;
+ return e;
+ });
+ }
+
+ UI::ChangeWidget(`id(`table), `Items, table_items);
+ UI::ChangeWidget(`id(`table), `CurrentItem, cur);
+
+ y2debug("cur: %1", cur);
+ y2debug("cur_item: %1", cur_item);
+ }
+ else if (ret == `add)
+ {
+ integer newid=items+1;
+ term newitem = KeyValueDialog(newid, `empty() );
+ if (newitem == nil) continue;
+ else
+ {
+ table_items = add(table_items, newitem);
+ UI::ChangeWidget(`id(`table), `Items, table_items);
+ UI::ChangeWidget(`id(`table), `CurrentItem, newid);
+ }
+ y2debug("newitem: %1", newitem);
+ }
+ else if ( ret == `delete )
+ {
+ integer cur = (integer) UI::QueryWidget(`id(`table), `CurrentItem);
+
+ table_items = filter(term e, table_items, {
+ if (cur == e[0,0]:nil) return false;
+ return true;
+ });
+
+ y2debug("deleted from list item: %1", cur);
+ UI::ChangeWidget(`id(`table), `Items, table_items);
+ UI::ChangeWidget(`id(`table), `CurrentItem, cur-1 );
+ }
+ else if ( ret == `abort || ret == `cancel )
+ {
+ if(Popup::ReallyAbort(true)) break;
+ else continue;
+ }
+
+ // refresh counter and buttons
+ items = size(table_items);
+ UI::ChangeWidget(`id(`edit), `Enabled, items > 0);
+ UI::ChangeWidget(`id(`delete), `Enabled, items > 0);
+
+ } until (ret == `next || ret == `abort || ret == `back);
+
+
+ if (ret == `next)
+ {
+ Register::do_registration = (boolean) UI::QueryWidget(`id(`run), `Value);
+ Register::submit_hwdata = (boolean) UI::QueryWidget(`id(`sub_hw), `Value);
+ Register::submit_optional = (boolean) UI::QueryWidget(`id(`sub_opt), `Value);
+
+ Register::registration_data = $[];
+ foreach(term e, table_items, {
+ Register::registration_data[e[1]:""] = e[2]:"";
+ });
+
+ y2debug("finish: wrote settings to global variables");
+ y2debug("do_registration: %1", Register::do_registration);
+ y2debug("submit_hwdata: %1", Register::submit_hwdata);
+ y2debug("submit_optional: %1", Register::submit_optional);
+ y2debug("registration_data: %1", Register::registration_data);
+ }
+
+ UI::CloseDialog();
+
+ return ret;
+}
+
+
+
+//---------------------------------------------------------------------------
+// MAIN
+//---------------------------------------------------------------------------
+y2milestone("----------------------------------------");
+y2milestone("suse_register_auto started");
+
+
+any ret = nil;
+string func = "";
+map param = $[];
+
+/* Check arguments */
+if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) {
+ func = (string)WFM::Args(0);
+ if(size(WFM::Args()) > 1 && is(WFM::Args(1), map))
+ param = (map) WFM::Args(1);
+}
+
+y2milestone("func=%1", func);
+y2milestone("param=%1", param);
+
+/* Create a summary*/
+if(func == "Summary") {
+ ret = Summary();
+}
+/* Reset configuration */
+else if (func == "Reset") {
+ Import($[]);
+ ret = $[];
+}
+/* Change configuration (run AutoSequence) */
+else if (func == "Change") {
+ ret = suse_register_configuration();
+}
+/* Import configuration */
+else if (func == "Import") {
+ ret = Import(param);
+}
+/* Return actual state */
+else if (func == "Export") {
+ ret = Export();
+}
+/* Return needed packages */
+else if (func == "Packages") {
+ ret = AutoPackages();
+}
+/* Write given settings */
+else if (func == "Write") {
+ import "Progress";
+ Progress::off();
+ ret = Write();
+ Progress::on();
+}
+else if (func == "GetModified") {
+ ret = Register::autoYaSTModified;
+}
+else if (func == "SetModified") {
+ Register::autoYaSTModified = true;
+}
+/* Unknown function */
+else {
+ y2error("Unknown function: %1", func);
+ ret = false;
+}
+
+y2milestone("ret=%1", ret);
+y2milestone("suse_register_auto finished");
+y2milestone("----------------------------------------");
+
+return ret;
+
+/* EOF */
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.49/src/modules/Register.ycp new/yast2-installation-2.13.51/src/modules/Register.ycp
--- old/yast2-installation-2.13.49/src/modules/Register.ycp 2006-03-24 08:16:43.000000000 +0100
+++ new/yast2-installation-2.13.51/src/modules/Register.ycp 2006-03-27 16:30:47.000000000 +0200
@@ -26,12 +26,14 @@
// START: Globally defined data, access via Register::<variable>
// --------------------------------------------------------------
-global boolean do_registration = true;
+global boolean autoYaSTModified = false;
+global boolean do_registration = false;
global boolean iamroot = false;
global boolean submit_optional = false;
global boolean submit_hwdata = false;
+global map registration_data = $[];
// ------------------------------------------------------------------
// END: Globally defined data, access via Register::<variable>
@@ -71,7 +73,7 @@
// check if we are root
map userid = (map) SCR::Execute(.target.bash_output, "id -u");
y2milestone("running with user id %1", userid);
- return String::FirstChunk(userid["stdout"]:"1", "\n") == "0" ? true:false;
+ return String::FirstChunk(userid["stdout"]:"1", "\n") == "0" ? true:false;
}
@@ -103,9 +105,9 @@
foreach (string line,
splitstring ((string)SCR::Read(.target.string, home_config ),"\n"), {
if ( regexpmatch(line, "^SUBMIT_OPTIONAL=\"[^\"]*\".*$") )
- submit_optional = regexpsub(line, "^SUBMIT_OPTIONAL=\"([^\"]*)\".*$", "\\1") == "true" ? true:false;
+ submit_optional = regexpsub(line, "^SUBMIT_OPTIONAL=\"([^\"]*)\".*$", "\\1") == "true" ? true:false;
else if ( regexpmatch(line, "^SUBMIT_HWDATA=\"[^\"]*\".*$") )
- submit_hwdata = regexpsub(line, "^SUBMIT_HWDATA=\"([^\"]*)\".*$", "\\1") == "true" ? true:false;
+ submit_hwdata = regexpsub(line, "^SUBMIT_HWDATA=\"([^\"]*)\".*$", "\\1") == "true" ? true:false;
});
}
}
@@ -170,6 +172,7 @@
*/
global void finish()
{
+ iamroot = amIroot();
write_config();
}
@@ -190,13 +193,17 @@
if (parameter == `autoyast)
{
- //TODO: append values from map to the suse_register call
- y2milestone ("called from autoyast");
+ // append values from map to the suse_register call
+ foreach (string key, string val, registration_data, {
+ key = String::CutRegexMatch(key, "[^A-Za-z0-9_-]+", true );
+ params = params + sformat(" -a %1='%2' ", key, String::Quote(val) );
+ });
+ y2milestone ("called from autoyast - added registration data to suse_register call");
}
- if ( Mode::normal() ) params = params + " --force-registration ";
- if ( submit_hwdata == false ) params = params + " --no-hw-data ";
- if ( submit_optional == false ) params = params + " --no-optional ";
+ if ( Mode::normal() ) params = params + " --force-registration ";
+ if ( submit_hwdata == false ) params = params + " --no-hw-data ";
+ if ( submit_optional == false ) params = params + " --no-optional ";
// run suse_register
y2milestone ("Calling /usr/bin/suse_register %1", params);
@@ -226,7 +233,7 @@
*/
global void Read()
{
- y2milestone ("called Register::Read");
+ initialize();
}
@@ -235,29 +242,48 @@
*/
global boolean Import(map settings)
{
+ iamroot = amIroot();
+
+ submit_optional = false;
+ submit_hwdata = false;
+ do_registration = false;
+ registration_data = $[];
+
+ submit_optional = (boolean) settings["submit_optional"]:submit_optional;
+ submit_hwdata = (boolean) settings["submit_hwdata"]:submit_hwdata;
+ do_registration = (boolean) settings["do_registration"]:do_registration;
+ registration_data = (map) settings["registration_data"]:$[];
+
return true;
}
-
-/**
- * AutoYaST interface function: Export()
- * @return map with the settings
+/*
+ * Write()
*/
-global map Export()
+global boolean Write()
{
- return $[];
+ iamroot = amIroot();
+ if (do_registration) suseRegister(`autoyast);
+ finish();
+ return true;
}
+
+
/**
- * AutoYaST interface function: Summary()
- * @return summary string (html)
+ * AutoYaST interface function: Export()
+ * @return map with the settings
*/
-global string Summary()
+global map Export()
{
- return "";
+ return $[
+ "submit_optional":submit_optional,
+ "submit_hwdata":submit_hwdata,
+ "do_registration":do_registration,
+ "registration_data":registration_data
+ ];
}
-
} // -EOF-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...