Hello community,
here is the log from the commit of package yast2-installation
checked in at Wed Mar 29 16:59:27 CEST 2006.
--------
--- yast2-installation/yast2-installation.changes 2006-03-28 21:48:53.000000000 +0200
+++ yast2-installation/yast2-installation.changes 2006-03-29 16:46:06.000000000 +0200
@@ -1,0 +2,14 @@
+Wed Mar 29 16:43:02 CEST 2006 - locilka@suse.cz
+
+- Fixed adding SLP-based Add-On product (#161270)
+- SLP-based Add-On product handling moved to separate function
+- Add-On MediaSelect dialog creation moved to separate function
+- Changed icon for License
+- 2.13.52
+
+-------------------------------------------------------------------
+Tue Mar 29 16:06:23 CEST 2006 - jdsn@suse.de
+
+- late feature "force registration" for suse_register (aj, shorn)
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.13.51.tar.bz2
New:
----
yast2-installation-2.13.52.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.kceeor/_old 2006-03-29 16:58:03.000000000 +0200
+++ /var/tmp/diff_new_pack.kceeor/_new 2006-03-29 16:58:03.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.13.51)
+# spec file for package yast2-installation (Version 2.13.52)
#
# 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.51
+Version: 2.13.52
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.13.51.tar.bz2
+Source0: yast2-installation-2.13.52.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.51
+%setup -n yast2-installation-2.13.52
%build
%{prefix}/bin/y2tool y2autoconf
@@ -106,6 +106,14 @@
/usr/X11R6/share/fvwm/
%changelog -n yast2-installation
+* Wed Mar 29 2006 - locilka@suse.cz
+- Fixed adding SLP-based Add-On product (#161270)
+- SLP-based Add-On product handling moved to separate function
+- Add-On MediaSelect dialog creation moved to separate function
+- Changed icon for License
+- 2.13.52
+* Wed Mar 29 2006 - jdsn@suse.de
+- late feature "force registration" for suse_register (aj, shorn)
* 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
++++++ yast2-installation-2.13.51.tar.bz2 -> yast2-installation-2.13.52.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/VERSION new/yast2-installation-2.13.52/VERSION
--- old/yast2-installation-2.13.51/VERSION 2006-03-28 21:30:21.000000000 +0200
+++ new/yast2-installation-2.13.52/VERSION 2006-03-29 16:46:14.000000000 +0200
@@ -1 +1 @@
-2.13.51
+2.13.52
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/configure new/yast2-installation-2.13.52/configure
--- old/yast2-installation-2.13.51/configure 2006-03-28 21:43:26.000000000 +0200
+++ new/yast2-installation-2.13.52/configure 2006-03-29 16:48:20.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.51.
+# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.52.
#
# 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.51'
-PACKAGE_STRING='yast2-installation 2.13.51'
+PACKAGE_VERSION='2.13.52'
+PACKAGE_STRING='yast2-installation 2.13.52'
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.51 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.13.52 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.51:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.13.52:";;
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.51
+yast2-installation configure 2.13.52
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.51, which was
+It was created by yast2-installation $as_me 2.13.52, 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.51'
+ VERSION='2.13.52'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.51"
+VERSION="2.13.52"
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.51, which was
+This file was extended by yast2-installation $as_me 2.13.52, 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.51
+yast2-installation config.status 2.13.52
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.51/configure.in new/yast2-installation-2.13.52/configure.in
--- old/yast2-installation-2.13.51/configure.in 2006-03-28 21:43:18.000000000 +0200
+++ new/yast2-installation-2.13.52/configure.in 2006-03-29 16:48:15.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.51, http://www.suse.de/feedback, yast2-installation)
+AC_INIT(yast2-installation, 2.13.52, 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.51"
+VERSION="2.13.52"
RPMNAME="yast2-installation"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/control/control.xml new/yast2-installation-2.13.52/control/control.xml
--- old/yast2-installation-2.13.51/control/control.xml 2006-03-27 16:40:15.000000000 +0200
+++ new/yast2-installation-2.13.52/control/control.xml 2006-03-29 16:14:50.000000000 +0200
@@ -23,6 +23,7 @@
<register>
true
true
+ false
</register>
<software>
true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/control.pot new/yast2-installation-2.13.52/control.pot
--- old/yast2-installation-2.13.51/control.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.13.52/control.pot 2006-03-16 11:19:51.000000000 +0100
@@ -0,0 +1,334 @@
+# 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.51/installation.pot new/yast2-installation-2.13.52/installation.pot
--- old/yast2-installation-2.13.51/installation.pot 2006-03-28 20:57:05.000000000 +0200
+++ new/yast2-installation-2.13.52/installation.pot 2006-03-27 16:14:57.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-28 20:57+0200\n"
+"POT-Creation-Date: 2006-03-27 16:14+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -721,110 +721,103 @@
msgstr ""
#. strings for main (wizard) layout
-#. Transltors: This is title/brand - only translate the Configuration
-#: src/clients/inst_suse_register.ycp:51
+#: src/clients/inst_suse_register.ycp:49
msgid "Novell Customer Center Configuration"
msgstr ""
-#: src/clients/inst_suse_register.ycp:52
+#: src/clients/inst_suse_register.ycp:50
msgid "Update Configuration"
msgstr ""
-#: src/clients/inst_suse_register.ycp:58
+#: src/clients/inst_suse_register.ycp:55
msgid ""
"Get technical support and product updates and\n"
"manage subscriptions with Novell Customer Center."
msgstr ""
-#: src/clients/inst_suse_register.ycp:64
+#: src/clients/inst_suse_register.ycp:61
msgid "Configure Now (Recommended)"
msgstr ""
-#: src/clients/inst_suse_register.ycp:65
+#: src/clients/inst_suse_register.ycp:62
msgid "Configure Later"
msgstr ""
-#: src/clients/inst_suse_register.ycp:67
+#: src/clients/inst_suse_register.ycp:64
msgid "Include for Convenience"
msgstr ""
-#. Translators: Text for UI Label - capitalized
-#: src/clients/inst_suse_register.ycp:68
-#: src/clients/suse_register_auto.ycp:198
+#: src/clients/inst_suse_register.ycp:65
msgid "Hardware Profile"
msgstr ""
-#. Translators: Text for UI Label - capitalized
-#: src/clients/inst_suse_register.ycp:69
-#: src/clients/suse_register_auto.ycp:200
+#: src/clients/inst_suse_register.ycp:66
msgid "Optional Information"
msgstr ""
-#: src/clients/inst_suse_register.ycp:70
-#: src/clients/inst_suse_register.ycp:151
+#: src/clients/inst_suse_register.ycp:67
+#: src/clients/inst_suse_register.ycp:145
msgid "Details..."
msgstr ""
#. strings for success popup
-#: src/clients/inst_suse_register.ycp:74
+#: src/clients/inst_suse_register.ycp:71
msgid "Your configuration was successful."
msgstr ""
#. strings for manual interaction popup
-#: src/clients/inst_suse_register.ycp:78
+#: src/clients/inst_suse_register.ycp:75
msgid "Manual Interaction Required"
msgstr ""
-#: src/clients/inst_suse_register.ycp:79
+#: src/clients/inst_suse_register.ycp:76
msgid "Needed Information"
msgstr ""
-#: src/clients/inst_suse_register.ycp:80
+#: src/clients/inst_suse_register.ycp:77
msgid "Continue"
msgstr ""
-#: src/clients/inst_suse_register.ycp:82
+#: src/clients/inst_suse_register.ycp:79
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:88
+#: src/clients/inst_suse_register.ycp:85
msgid "Registration and Privacy Information"
msgstr ""
-#: src/clients/inst_suse_register.ycp:92
+#: src/clients/inst_suse_register.ycp:89
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:97
+#: src/clients/inst_suse_register.ycp:94
msgid "Update Source Issues"
msgstr ""
-#: src/clients/inst_suse_register.ycp:99
+#: src/clients/inst_suse_register.ycp:96
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"
-"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."
+"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."
msgstr ""
#. error messages
-#: src/clients/inst_suse_register.ycp:110
+#: src/clients/inst_suse_register.ycp:104
msgid "Error: Recieved data is invalid."
msgstr ""
-#: src/clients/inst_suse_register.ycp:111
+#: src/clients/inst_suse_register.ycp:105
msgid "Error: Could not retrieve data."
msgstr ""
-#: src/clients/inst_suse_register.ycp:117
+#: src/clients/inst_suse_register.ycp:111
msgid ""
"<p>\n"
"Configure your system to enable online updates by registering it with Novell.\n"
@@ -833,7 +826,7 @@
"</p>"
msgstr ""
-#: src/clients/inst_suse_register.ycp:125
+#: src/clients/inst_suse_register.ycp:119
msgid ""
"<p>\n"
"To simplify the registration process, include information from your system\n"
@@ -845,7 +838,7 @@
"</p>"
msgstr ""
-#: src/clients/inst_suse_register.ycp:136
+#: src/clients/inst_suse_register.ycp:130
msgid ""
"<p>\n"
"No information is passed to anyone outside Novell. The data is used for\n"
@@ -856,23 +849,23 @@
msgstr ""
#. further strings
-#: src/clients/inst_suse_register.ycp:148
+#: src/clients/inst_suse_register.ycp:142
msgid "Checking..."
msgstr ""
-#: src/clients/inst_suse_register.ycp:149
+#: src/clients/inst_suse_register.ycp:143
msgid "Error"
msgstr ""
-#: src/clients/inst_suse_register.ycp:150
+#: src/clients/inst_suse_register.ycp:144
msgid "An error occurred while connecting to the server."
msgstr ""
-#: src/clients/inst_suse_register.ycp:152
+#: src/clients/inst_suse_register.ycp:146
msgid "Error Message"
msgstr ""
-#: src/clients/inst_suse_register.ycp:153
+#: src/clients/inst_suse_register.ycp:147
msgid "Starting Browser..."
msgstr ""
@@ -1184,106 +1177,6 @@
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.51/src/clients/inst_suse_register.ycp new/yast2-installation-2.13.52/src/clients/inst_suse_register.ycp
--- old/yast2-installation-2.13.51/src/clients/inst_suse_register.ycp 2006-03-28 20:19:33.000000000 +0200
+++ new/yast2-installation-2.13.52/src/clients/inst_suse_register.ycp 2006-03-29 16:14:50.000000000 +0200
@@ -40,6 +40,9 @@
}
}
+ // Register::initialize() is mandatory - never remove it
+ Register::initialize();
+
map ui = UI::GetDisplayInfo();
boolean textmode = (boolean) ui["TextMode"]:nil;
@@ -67,6 +70,7 @@
string nccc_sub_comment = _("Include for Convenience");
string nccc_sub_hwinfo = _("Hardware Profile");
string nccc_sub_optional= _("Optional Information");
+ string nccc_forcereg= _("Registration Code");
string nccc_sub_showbtn = _("Details...");
@@ -134,13 +138,22 @@
string help_para3 = _(
"<p>
+If you purchased your copy of this product, enable <b>Registration Code</b>
+so you are prompted for your product code.
+This registers you for the installation support included with your product.
+</p>"
+);
+
+string help_para4 = _(
+"<p>
No information is passed to anyone outside Novell. The data is used for
statistical purposes and to enhance your convenience regarding driver support
and your Web account. Find a detailed privacy policy in <b>Details</b>. View
the transmitted information in the log file <tt>~/.suse_register.log</tt>.
</p>"
);
-string help = help_title + help_para1 + help_para2 + help_para3;
+
+string help = help_title + help_para1 + help_para2 + (Register::display_forcereg ? help_para3:"") + help_para4;
@@ -160,11 +173,6 @@
// default is true, see statement in layout term
boolean configure_status = true;
-
- // Register::initialize() is mandatory - never remove it
- Register::initialize();
-
-
/* vv MAIN (WIZARD) LAYOUT vv */
term sr_layout=nil;
sr_layout=`HVCenter( `VBox(
@@ -180,6 +188,7 @@
`Left( `Label( nccc_sub_comment ) ),
`Left( `CheckBox(`id(`hwinfo), `opt(`notify), nccc_sub_hwinfo, Register::submit_hwdata ) ),
`Left( `CheckBox(`id(`optional), `opt(`notify), nccc_sub_optional, Register::submit_optional ) ),
+ Register::display_forcereg ? `Left( `CheckBox(`id(`forcereg), `opt(`notify), nccc_forcereg, false ) ):`Empty() ,
`VSpacing(0.5),
`Right( `PushButton(`id(`showinfo), nccc_sub_showbtn ) )
) ) ) ,
@@ -477,10 +486,11 @@
{
configure_status = (boolean) UI::QueryWidget(`id(`configure), `Value);
}
- else if (ret == `hwinfo || ret == `optional)
+ else if (ret == `hwinfo || ret == `optional || ret == `forcereg)
{
Register::submit_hwdata = (boolean) UI::QueryWidget(`id(`hwinfo), `Value);
Register::submit_optional= (boolean) UI::QueryWidget(`id(`optional), `Value);
+ Register::force_registration = (boolean) UI::QueryWidget(`id(`forcereg), `Value);
}
else if (ret == `showinfo)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/src/clients/stroj-casu.ycp new/yast2-installation-2.13.52/src/clients/stroj-casu.ycp
--- old/yast2-installation-2.13.51/src/clients/stroj-casu.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.13.52/src/clients/stroj-casu.ycp 2006-03-29 14:20:10.000000000 +0200
@@ -0,0 +1,57 @@
+/**
+ * Stroj času.
+ * Enable very easy bug fixes of anything, given the proper hardware
+ * $Id: stroj-casu.ycp 29498 2006-03-29 09:51:05Z mvidner $
+ */
+{
+ // text domain!
+
+ // Achtung! Zu showcasen des N*E*U*S Features dess YCP Interpretersss,
+ // wir benutzen deutsche Klavier Worte.
+ // (J.W.G., sorry...)
+
+ Einfuhrgenehmigung "Popup";
+ Einfuhrgenehmigung "Wizard";
+ Einfuhrgenehmigung "WizardHW";
+
+ // translations:
+ // not to cause unnecessary confusion now,
+ // the texts are marked with a dummy marker
+ string Tr (string s) {
+ Wiederkehr s;
+ }
+
+ Wizard::CreateDialog ();
+ string caption = Tr("Time Machine Configuration");
+ string help = Tr("<p>When I was younger,<br>
+so much younger than today,<br>...</p>");
+ Verzeichnis<string> headings = [
+ Tr("Time Machine"),
+ Tr("Temporal Range"), //
+ Tr("Spatial Range"), //
+ Tr("Temporal Accuracy"), //
+ Tr("Spatial Accuracy"), //
+ ];
+ Verzeichnis<Verzeichnis> buttons = [
+ [ `repair, Tr("Self &Repair") ],
+ [ `booooooooom, Tr("Self &Destruction") ],
+ ];
+ WizardHW::CreateHWDialog (caption, help, headings, buttons);
+
+ Verzeichnis > items = (Verzeichnis >) SCR::Read (.probe.time_machines);
+ if (items == nil) {
+ items = [];
+ }
+ WizardHW::SetContents (items);
+
+ Karte ui = WizardHW::UserInput ();
+ any ret = ui["event"]:`ugh;
+ Verzeichnis wait = [`add, `repair, `booooooooom];
+ y2milestone ("%1", ret);
+ falls (contains (wait, ret)) {
+ Popup::TimedWarning(Tr("Waiting for the feature to appear..."),
+ 365*24*3600);
+ }
+
+ Wizard::CloseDialog ();
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/src/include/add-on-workflow.ycp new/yast2-installation-2.13.52/src/include/add-on-workflow.ycp
--- old/yast2-installation-2.13.51/src/include/add-on-workflow.ycp 2006-03-23 14:33:01.000000000 +0100
+++ new/yast2-installation-2.13.52/src/include/add-on-workflow.ycp 2006-03-29 16:41:42.000000000 +0200
@@ -48,12 +48,95 @@
return `next;
}
+// Used for adding sources
+symbol createResult = `again;
+
/**
- * Run dialog for selecting the media
- * @return symbol for wizard sequencer
+ * Function scans for SLP installation servers on the network
+ *
+ * @returns symbol one of `back, `ok
*/
-symbol MediaSelect () {
- y2milestone ("Running media select dialog");
+symbol AddSourceTypeSLP () {
+ // Return value (`back as a fall`back)
+ symbol ret = `back;
+
+ /* Scanning network for SLP servers */
+ // translators: popup busy message
+ UI::OpenDialog (`Label (_("Scanning network...")) );
+ list<map> services = SLP::FindSrvs ("install.suse", "");
+ UI::CloseDialog ();
+
+ /* No SLP servers found */
+ if ( size(services) == 0 )
+ {
+ y2warning("No SLP catalogs");
+ // error popup
+ Report::Error ( _("No SLP catalogs found.") );
+ ret = `back;
+
+ /* Some serves were found */
+ }
+ else {
+ // show the dialog to pick the source
+ list<term> items = maplist (map service, services, ``{
+ string url = service["srvurl"]:"";
+ url = substring (url, 21);
+ // split the URL
+ map parsed_url = URL::Parse (url);
+ return `item (`id (url), toupper ( parsed_url["scheme"]:"http" ), url);
+ });
+ UI::OpenDialog (
+ `VBox(
+ // translators: popup heading
+ `Heading (_("Choose SLP Catalog")),
+ `MinSize( 25, 7,
+ // translators: table header
+ `Table (`id(`services), `header(
+ // table header
+ _("Type"),
+ // table header
+ _("URL")),
+ items)
+ ),
+ `HBox (
+ `PushButton (`id (`ok), `opt(`default), Label::SelectButton ()),
+ `VSpacing (1),
+ `PushButton (`id (`cancel), Label::CancelButton ())
+ )
+ )
+ );
+ symbol ret = (symbol)UI::UserInput ();
+ if (ret == `ok)
+ {
+ string service = (string) UI::QueryWidget (`services, `CurrentItem);
+ y2milestone ("Trying to add source '%1'", service);
+ if (service != nil)
+ {
+ // add the installation source
+ createResult = SourceManager::createSource(service);
+ y2milestone ("Adding source result: %1", createResult);
+ }
+ else
+ {
+ y2warning("No source selected, returning back...");
+ ret = `back;
+ }
+ }
+ else
+ {
+ y2milestone("Adding SLP source cancelled");
+ ret = `back;
+ }
+ UI::CloseDialog ();
+ }
+
+ return ret;
+}
+
+/**
+ * Creates dialog content for MediaSelect
+ */
+void CreateMediaSelectDialog () {
term contents = `HBox (`HStretch (), `VBox (
`RadioButtonGroup (`id (`type), `VBox (
`VStretch (),
@@ -132,11 +215,19 @@
");
Wizard::SetContents (title, contents, help_text, Stage::initial(), true);
+}
+
+/**
+ * Run dialog for selecting the media
+ * @return symbol for wizard sequencer
+ */
+symbol MediaSelect () {
+ y2milestone ("Running media select dialog");
+ CreateMediaSelectDialog();
symbol ret = nil;
string url = "";
while (ret == nil) {
- symbol createResult = `again;
ret = (symbol)UI::UserInput ();
if (ret == `back)
break;
@@ -161,58 +252,9 @@
symbol input = (symbol)UI::QueryWidget (`id (`type), `CurrentButton);
if ( input == `slp )
{
- // translators: popup busy message
- UI::OpenDialog (`Label (_("Scanning network...")) );
- list<map> services = SLP::FindSrvs ("install.suse", "");
- UI::CloseDialog ();
- if ( size(services) == 0 )
- {
- // error popup
- Popup::Error ( _("No SLP catalogs found.") );
- } else
- {
- // show the dialog to pick the source
- list<term> items = maplist (map service, services, ``{
- string url = service["srvurl"]:"";
- url = substring (url, 21);
- // split the URL
- map parsed_url = URL::Parse (url);
- return `item (`id (url), toupper ( parsed_url["scheme"]:"http" ), url);
- });
- UI::OpenDialog (
- `VBox(
- // translators: popup heading
- `Heading (_("Choose SLP Catalog")),
- `MinSize( 25, 7,
- // translators: table header
- `Table (`id(`services), `header(
- // table header
- _("Type"),
- // table header
- _("URL")),
- items)
- ),
- `HBox (
- `PushButton (`id (`ok), `opt(`default), Label::SelectButton ()),
- `VSpacing (1),
- `PushButton (`id (`cancel), Label::CancelButton ())
- )
- )
- );
- symbol ret = (symbol)UI::UserInput ();
- if (ret == `ok)
- {
- string service = (string) UI::QueryWidget (`services, `CurrentItem);
- y2milestone ("Trying to add source '%1'", service);
- if (service != nil)
- {
- // add the installation source
- createResult = SourceManager::createSource(service);
- y2milestone ("Adding source result: %1", createResult);
- }
- }
- UI::CloseDialog ();
- }
+ // moved to another function
+ ret = AddSourceTypeSLP();
+ y2milestone("SLP-Add returned: %1", ret);
}
else if ( input == `ftp || input == `http || input == `https || input == `samba )
@@ -288,6 +330,8 @@
*/
symbol CatalogSelect () {
list<integer> sources = SourceManager::newSources;
+ y2milestone("New sources: %1", sources);
+
if (size (sources) == 0)
{
// error report
@@ -304,6 +348,7 @@
}
integer src_id = SourceManager::newSources[0]:0;
map data = Pkg::SourceGeneralData (src_id);
+ y2milestone("Adding product: %1", data);
string url = data["url"]:"";
string product_dir = data["product_dir"]:"";
y2milestone ("Deleting source %1", src_id);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/src/modules/AddOnProduct.ycp new/yast2-installation-2.13.52/src/modules/AddOnProduct.ycp
--- old/yast2-installation-2.13.51/src/modules/AddOnProduct.ycp 2006-03-23 14:33:01.000000000 +0100
+++ new/yast2-installation-2.13.52/src/modules/AddOnProduct.ycp 2006-03-29 16:25:05.000000000 +0200
@@ -721,7 +721,7 @@
Wizard::SetContents(caption, contents, help,
false, true);
- Wizard::SetTitleIcon ("yast-license");
+ Wizard::SetTitleIcon ("yast-product-registration");
Wizard::SetFocusToNextButton();
return true;
@@ -745,6 +745,7 @@
*/
global boolean AcceptedLicenseAndInfoFile (integer src_id) {
// Check for info.txt
+ y2milestone("Checking source: ID %1", src_id);
string info_file = Pkg::SourceProvideOptionalFile (src_id, 1, "/media.1/info.txt");
string license_file = Pkg::SourceProvideOptionalFile (src_id, 1, "/media.1/license.zip");
@@ -752,6 +753,7 @@
// license is part of the add-on product
if (license_file != nil) {
+ y2milestone("Product has a license");
string tmpdir = (string) SCR::Read(.target.tmpdir) + "/add-on-license/";
map out = (map)SCR::Execute (.target.bash_output, sformat ("
rm -rf '%1' && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/src/modules/Installation.ycp new/yast2-installation-2.13.52/src/modules/Installation.ycp
--- old/yast2-installation-2.13.51/src/modules/Installation.ycp 2006-03-15 16:33:56.000000000 +0100
+++ new/yast2-installation-2.13.52/src/modules/Installation.ycp 2006-03-29 16:14:50.000000000 +0200
@@ -11,7 +11,7 @@
* Author:
* Klaus Kaempf
*
- * $Id: Installation.ycp 24080 2005-07-15 13:35:15Z jsrain $
+ * $Id: Installation.ycp 29517 2006-03-29 13:54:01Z mvidner $
*/
{
@@ -40,9 +40,6 @@
global string mountlog = Directory::logdir + "/y2logMount";
- // default language for the installation (from installation source)
- global string defaultLanguage = "en_US";
-
// encoding for the language
global string encoding = "ISO-8859-1";
@@ -88,8 +85,6 @@
destdir = "/mnt";
scr_destdir = "/mnt";
}
-
- defaultLanguage = Pkg::GetLocale();
}
define void Initialize () {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/src/modules/Register.ycp new/yast2-installation-2.13.52/src/modules/Register.ycp
--- old/yast2-installation-2.13.51/src/modules/Register.ycp 2006-03-27 16:30:47.000000000 +0200
+++ new/yast2-installation-2.13.52/src/modules/Register.ycp 2006-03-29 16:14:50.000000000 +0200
@@ -32,6 +32,8 @@
global boolean submit_optional = false;
global boolean submit_hwdata = false;
+global boolean force_registration = false;
+global boolean display_forcereg = false;
global map registration_data = $[];
@@ -88,6 +90,8 @@
// first read from control file
submit_optional = ProductFeatures::GetBooleanFeature("register", "enable_register_optional");
submit_hwdata = ProductFeatures::GetBooleanFeature("register", "enable_register_hwdata");
+ // this boolean comes only from the control file - nowhere to be saved
+ display_forcereg = ProductFeatures::GetBooleanFeature("register", "display_register_forcereg");
// then read from sysconfig
if (FileUtils::Exists("/etc/sysconfig/suse_register"))
@@ -201,9 +205,9 @@
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 ( force_registration ) params = params + " --force-registration ";
+ if ( !submit_hwdata ) params = params + " --no-hw-data ";
+ if ( !submit_optional ) params = params + " --no-optional ";
// run suse_register
y2milestone ("Calling /usr/bin/suse_register %1", params);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...