Mailinglist Archive: opensuse-commit (1187 mails)

< Previous Next >
commit yast2-installation
  • From: root@xxxxxxx (h_root)
  • Date: Thu, 20 Apr 2006 20:14:40 +0200 (CEST)
  • Message-id: <20060420181440.5AA3A8BE9E@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-installation
checked in at Thu Apr 20 20:14:40 CEST 2006.

--------
--- yast2-installation/yast2-installation.changes 2006-04-20 16:09:28.000000000 +0200
+++ NOARCH/yast2-installation/yast2-installation.changes 2006-04-20 19:17:24.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Apr 20 18:51:55 CEST 2006 - jdsn@xxxxxxx
+
+- proxy support for registration process (#165891)
+- disable w3m registration by control variable (aj)
+- 2.13.81
+
+-------------------------------------------------------------------

Old:
----
yast2-installation-2.13.80.tar.bz2

New:
----
yast2-installation-2.13.81.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.EFZUDb/_old 2006-04-20 20:12:20.000000000 +0200
+++ /var/tmp/diff_new_pack.EFZUDb/_new 2006-04-20 20:12:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.13.80)
+# spec file for package yast2-installation (Version 2.13.81)
#
# 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.80
+Version: 2.13.81
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.13.80.tar.bz2
+Source0: yast2-installation-2.13.81.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 <arvin@xxxxxxx>

%prep
-%setup -n yast2-installation-2.13.80
+%setup -n yast2-installation-2.13.81

%build
%{prefix}/bin/y2tool y2autoconf
@@ -106,6 +106,10 @@
/usr/X11R6/share/fvwm/

%changelog -n yast2-installation
+* Thu Apr 20 2006 - jdsn@xxxxxxx
+- proxy support for registration process (#165891)
+- disable w3m registration by control variable (aj)
+- 2.13.81
* Thu Apr 20 2006 - mvidner@xxxxxxx
- When cloning, save installation sources beforehand (#165860).
- 2.13.80

++++++ yast2-installation-2.13.80.tar.bz2 -> yast2-installation-2.13.81.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.80/Makefile.am new/yast2-installation-2.13.81/Makefile.am
--- old/yast2-installation-2.13.80/Makefile.am 2006-04-20 16:25:17.000000000 +0200
+++ new/yast2-installation-2.13.81/Makefile.am 2006-04-20 18:52:27.000000000 +0200
@@ -8,7 +8,6 @@

#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool

VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -96,7 +95,7 @@
done

pot:
- $(Y2TOOL) y2makepot -s $(srcdir)
+ y2tool y2makepot -s $(srcdir)

install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -117,7 +116,7 @@
fi

spellcheck: pot
- $(Y2TOOL) pot-spellcheck
+ y2tool pot-spellcheck

# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))

@@ -144,20 +143,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(Y2TOOL); then \
- echo "$(Y2TOOL): not found."; \
+ if ! test -x $(PREFIX)/bin/y2tool; then \
+ echo "$(PREFIX)/bin/y2tool: not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
+ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done

package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local

-TAGVERSION = $(Y2TOOL) tagversion
+TAGVERSION = $(PREFIX)/bin/y2tool tagversion

check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -201,12 +200,12 @@
fi

check-textdomain:
- $(Y2TOOL) check-textdomain $(srcdir)
+ $(PREFIX)/bin/y2tool check-textdomain $(srcdir)

stable: checkin-stable

checkin-stable: package
- $(Y2TOOL) checkin-stable
+ $(PREFIX)/bin/y2tool checkin-stable


# For po/ modules
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.80/Makefile.in new/yast2-installation-2.13.81/Makefile.in
--- old/yast2-installation-2.13.80/Makefile.in 2006-04-20 16:25:40.000000000 +0200
+++ new/yast2-installation-2.13.81/Makefile.in 2006-04-20 18:52:45.000000000 +0200
@@ -208,7 +208,6 @@

#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS)
ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4)
HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE)
@@ -238,7 +237,7 @@
$(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) $(am__append_1)
@CREATE_PKGCONFIG_NOARCH_TRUE@@CREATE_PKGCONFIG_TRUE@pkgconfigdata_DATA = $(RPMNAME).pc
@CREATE_PKGCONFIG_NOARCH_FALSE@@CREATE_PKGCONFIG_TRUE@pkgconfig_DATA = $(RPMNAME).pc
-TAGVERSION = $(Y2TOOL) tagversion
+TAGVERSION = $(PREFIX)/bin/y2tool tagversion
# test ! -d $(srcdir)/po \
# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
# Contents of ./SUBDIRS
@@ -735,7 +734,7 @@
done

pot:
- $(Y2TOOL) y2makepot -s $(srcdir)
+ y2tool y2makepot -s $(srcdir)

install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -756,7 +755,7 @@
fi

spellcheck: pot
- $(Y2TOOL) pot-spellcheck
+ y2tool pot-spellcheck

# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))

@@ -783,15 +782,15 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(Y2TOOL); then \
- echo "$(Y2TOOL): not found."; \
+ if ! test -x $(PREFIX)/bin/y2tool; then \
+ echo "$(PREFIX)/bin/y2tool: not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
+ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done

package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
@@ -838,12 +837,12 @@
fi

check-textdomain:
- $(Y2TOOL) check-textdomain $(srcdir)
+ $(PREFIX)/bin/y2tool check-textdomain $(srcdir)

stable: checkin-stable

checkin-stable: package
- $(Y2TOOL) checkin-stable
+ $(PREFIX)/bin/y2tool checkin-stable

# For po/ modules
checkpo:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.80/VERSION new/yast2-installation-2.13.81/VERSION
--- old/yast2-installation-2.13.80/VERSION 2006-04-20 16:06:22.000000000 +0200
+++ new/yast2-installation-2.13.81/VERSION 2006-04-20 16:27:26.000000000 +0200
@@ -1 +1 @@
-2.13.80
+2.13.81
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.80/configure new/yast2-installation-2.13.81/configure
--- old/yast2-installation-2.13.80/configure 2006-04-20 16:25:25.000000000 +0200
+++ new/yast2-installation-2.13.81/configure 2006-04-20 18:52:35.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.80.
+# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.81.
#
# 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.80'
-PACKAGE_STRING='yast2-installation 2.13.80'
+PACKAGE_VERSION='2.13.81'
+PACKAGE_STRING='yast2-installation 2.13.81'
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.80 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.13.81 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.80:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.13.81:";;
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.80
+yast2-installation configure 2.13.81
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.80, which was
+It was created by yast2-installation $as_me 2.13.81, 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.80'
+ VERSION='2.13.81'


cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@



-VERSION="2.13.80"
+VERSION="2.13.81"
RPMNAME="yast2-installation"
MAINTAINER="Jiri Srain <jsrain@xxxxxxx>"

@@ -2906,7 +2906,7 @@
} >&5
cat >&5 <<_CSEOF

-This file was extended by yast2-installation $as_me 2.13.80, which was
+This file was extended by yast2-installation $as_me 2.13.81, 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.80
+yast2-installation config.status 2.13.81
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.80/configure.in new/yast2-installation-2.13.81/configure.in
--- old/yast2-installation-2.13.80/configure.in 2006-04-20 16:25:16.000000000 +0200
+++ new/yast2-installation-2.13.81/configure.in 2006-04-20 18:52:26.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(yast2-installation, 2.13.80, http://www.suse.de/feedback, yast2-installation)
+AC_INIT(yast2-installation, 2.13.81, 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.80"
+VERSION="2.13.81"
RPMNAME="yast2-installation"
MAINTAINER="Jiri Srain <jsrain@xxxxxxx>"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.80/control/control.xml new/yast2-installation-2.13.81/control/control.xml
--- old/yast2-installation-2.13.80/control/control.xml 2006-04-18 10:05:50.000000000 +0200
+++ new/yast2-installation-2.13.81/control/control.xml 2006-04-20 16:17:04.000000000 +0200
@@ -22,6 +22,7 @@
<enable_register_hwdata config:type="boolean">true</enable_register_hwdata>
<enable_register_optional config:type="boolean">true</enable_register_optional>
<display_register_forcereg config:type="boolean">false</display_register_forcereg>
+ <disable_register_w3m config:type="boolean">false</disable_register_w3m>
<manual_online_update config:type="boolean">true</manual_online_update>
</globals>
<software>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.80/control/docs/control-doc.xml new/yast2-installation-2.13.81/control/docs/control-doc.xml
--- old/yast2-installation-2.13.80/control/docs/control-doc.xml 2005-04-19 15:34:02.000000000 +0200
+++ new/yast2-installation-2.13.81/control/docs/control-doc.xml 2006-03-15 16:33:54.000000000 +0100
@@ -28,7 +28,7 @@
0.1
</revnumber>
<date>
- $Date: 2004-10-27 16:25:24 +0200 (St, 27 říj 2004) $
+ $Date: 2004-10-27 16:25:24 +0200 (Wed, 27 Oct 2004) $
</date>
<revremark>Initial Release as PDF</revremark>
</revision>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.80/installation.pot new/yast2-installation-2.13.81/installation.pot
--- old/yast2-installation-2.13.80/installation.pot 2006-04-13 17:44:24.000000000 +0200
+++ new/yast2-installation-2.13.81/installation.pot 2006-03-28 23:07:57.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-13 17:44+0200\n"
+"POT-Creation-Date: 2006-03-28 23:07+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -56,18 +56,6 @@
msgid "Initializing fonts..."
msgstr ""

-#. feedback heading
-#. main screen heading
-#: src/clients/inst_addon_update_sources.ycp:47
-#: src/include/add-on-workflow.ycp:733
-msgid "Add-On Product Installation"
-msgstr ""
-
-#. feedback message
-#: src/clients/inst_addon_update_sources.ycp:49
-msgid "Reading packages available on the installation sources..."
-msgstr ""
-
#. strings for "ask for online update"-popup
#: src/clients/inst_ask_online_update.ycp:34
msgid "Run Update"
@@ -93,59 +81,59 @@

#. Check box: start the clone process and store the autoyast
#. profile in /root/autoinst.xml
-#: src/clients/inst_congratulate.ycp:55
+#: src/clients/inst_congratulate.ycp:53
msgid "&Clone This System for Autoyast"
msgstr ""

#. caption for dialog "Congratulation Dialog"
-#: src/clients/inst_congratulate.ycp:59
+#: src/clients/inst_congratulate.ycp:57
msgid "Installation Completed"
msgstr ""

#. congratulation text 1/4
-#: src/clients/inst_congratulate.ycp:62
+#: src/clients/inst_congratulate.ycp:60
msgid "<p><b>Congratulations!</b></p>"
msgstr ""

#. congratulation text 2/4
-#: src/clients/inst_congratulate.ycp:65
+#: src/clients/inst_congratulate.ycp:63
msgid ""
"<p>The installation of &product; on your machine is complete.\n"
"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
msgstr ""

#. congratulation text 3/4
-#: src/clients/inst_congratulate.ycp:70
+#: src/clients/inst_congratulate.ycp:68
#, ycp-format
msgid "<p>Visit us at %1.</p>"
msgstr ""

#. congratulation text 4/4
-#: src/clients/inst_congratulate.ycp:73
+#: src/clients/inst_congratulate.ycp:71
msgid "<p>Have a lot of fun!<br>Your SUSE Development Team</p>"
msgstr ""

#. help 1/4 for dialog "Congratulation Dialog"
-#: src/clients/inst_congratulate.ycp:92
+#: src/clients/inst_congratulate.ycp:90
msgid "<p>Your system is ready for use.</p>"
msgstr ""

#. help 2/4 for dialog "Congratulation Dialog"
-#: src/clients/inst_congratulate.ycp:95
+#: src/clients/inst_congratulate.ycp:93
msgid ""
"<p><b>Finish</b> will close the YaST installation and continue\n"
"to the login screen.</p>\n"
msgstr ""

#. help 3/4 for dialog "Congratulation Dialog"
-#: src/clients/inst_congratulate.ycp:100
+#: src/clients/inst_congratulate.ycp:98
msgid ""
"<p>If you choose the default graphical desktop KDE, you can\n"
"adjust some KDE settings to your hardware. Also notice\n"
"our SUSE Welcome Dialog.</p>\n"
msgstr ""

-#: src/clients/inst_congratulate.ycp:106
+#: src/clients/inst_congratulate.ycp:104
msgid ""
"<p>Use <b>Clone</b> if you want to create an AutoYaST profile.\n"
"AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
@@ -334,7 +322,7 @@
msgstr ""

#. yes-no popup
-#: src/clients/inst_license.ycp:148 src/modules/AddOnProduct.ycp:825
+#: src/clients/inst_license.ycp:148 src/modules/AddOnProduct.ycp:823
msgid "Reread or reconsider the license agreement?"
msgstr ""

@@ -344,7 +332,7 @@
msgstr ""

#. message popup
-#: src/clients/inst_license.ycp:179 src/modules/AddOnProduct.ycp:839
+#: src/clients/inst_license.ycp:179 src/modules/AddOnProduct.ycp:837
msgid "Accept or decline the license agreement."
msgstr ""

@@ -734,99 +722,94 @@

#. strings for main (wizard) layout
#. Transltors: This is title/brand - only translate the Configuration
-#: src/clients/inst_suse_register.ycp:63
+#: src/clients/inst_suse_register.ycp:54
msgid "Novell Customer Center Configuration"
msgstr ""

-#. following text is translated en->en in po file to "Configure Online Update"
-#: src/clients/inst_suse_register.ycp:65
+#: src/clients/inst_suse_register.ycp:55
msgid "Update Configuration"
msgstr ""

-#: src/clients/inst_suse_register.ycp:71
+#: src/clients/inst_suse_register.ycp:61
msgid ""
"Get technical support and product updates and\n"
"manage subscriptions with Novell Customer Center."
msgstr ""

-#: src/clients/inst_suse_register.ycp:77
+#: src/clients/inst_suse_register.ycp:67
msgid "Configure Now (Recommended)"
msgstr ""

-#: src/clients/inst_suse_register.ycp:78
+#: src/clients/inst_suse_register.ycp:68
msgid "Configure Later"
msgstr ""

-#: src/clients/inst_suse_register.ycp:80
+#: src/clients/inst_suse_register.ycp:70
msgid "Include for Convenience"
msgstr ""

#. Translators: Text for UI Label - capitalized
-#: src/clients/inst_suse_register.ycp:81
+#: src/clients/inst_suse_register.ycp:71
#: src/clients/suse_register_auto.ycp:198
msgid "Hardware Profile"
msgstr ""

#. Translators: Text for UI Label - capitalized
-#: src/clients/inst_suse_register.ycp:82
+#: src/clients/inst_suse_register.ycp:72
#: src/clients/suse_register_auto.ycp:200
msgid "Optional Information"
msgstr ""

-#: src/clients/inst_suse_register.ycp:83
+#: src/clients/inst_suse_register.ycp:73
msgid "Registration Code"
msgstr ""

-#: src/clients/inst_suse_register.ycp:84
-#: src/clients/inst_suse_register.ycp:175
+#: src/clients/inst_suse_register.ycp:74
+#: src/clients/inst_suse_register.ycp:164
msgid "Details..."
msgstr ""

#. strings for success popup
-#: src/clients/inst_suse_register.ycp:88
+#: src/clients/inst_suse_register.ycp:78
msgid "Your configuration was successful."
msgstr ""

-#: src/clients/inst_suse_register.ycp:89
-msgid "An update server has been added to your configuration."
-msgstr ""
-
#. strings for manual interaction popup
-#: src/clients/inst_suse_register.ycp:93
+#: src/clients/inst_suse_register.ycp:82
msgid "Manual Interaction Required"
msgstr ""

-#: src/clients/inst_suse_register.ycp:94
+#: src/clients/inst_suse_register.ycp:83
msgid "Needed Information"
msgstr ""

-#: src/clients/inst_suse_register.ycp:95
+#: src/clients/inst_suse_register.ycp:84
msgid "Continue"
msgstr ""

-#: src/clients/inst_suse_register.ycp:97
+#: src/clients/inst_suse_register.ycp:86
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:103
+#: src/clients/inst_suse_register.ycp:92
msgid "Registration and Privacy Information"
msgstr ""

-#: src/clients/inst_suse_register.ycp:107
+#: src/clients/inst_suse_register.ycp:96
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:112
+#: src/clients/inst_suse_register.ycp:101
msgid "Update Source Issues"
msgstr ""

-#: src/clients/inst_suse_register.ycp:114
+#: src/clients/inst_suse_register.ycp:103
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"
@@ -837,15 +820,15 @@
msgstr ""

#. error messages
-#: src/clients/inst_suse_register.ycp:125
+#: src/clients/inst_suse_register.ycp:114
msgid "Error: Recieved data is invalid."
msgstr ""

-#: src/clients/inst_suse_register.ycp:126
+#: src/clients/inst_suse_register.ycp:115
msgid "Error: Could not retrieve data."
msgstr ""

-#: src/clients/inst_suse_register.ycp:132
+#: src/clients/inst_suse_register.ycp:121
msgid ""
"<p>\n"
"Configure your system to enable online updates by registering it with Novell.\n"
@@ -854,7 +837,7 @@
"</p>"
msgstr ""

-#: src/clients/inst_suse_register.ycp:140
+#: src/clients/inst_suse_register.ycp:129
msgid ""
"<p>\n"
"To simplify the registration process, include information from your system\n"
@@ -866,7 +849,7 @@
"</p>"
msgstr ""

-#: src/clients/inst_suse_register.ycp:151
+#: src/clients/inst_suse_register.ycp:140
msgid ""
"<p>\n"
"If you purchased your copy of this product, enable <b>Registration Code</b>\n"
@@ -875,7 +858,7 @@
"</p>"
msgstr ""

-#: src/clients/inst_suse_register.ycp:159
+#: src/clients/inst_suse_register.ycp:148
msgid ""
"<p>\n"
"No information is passed to anyone outside Novell. The data is used for\n"
@@ -886,23 +869,23 @@
msgstr ""

#. further strings
-#: src/clients/inst_suse_register.ycp:172
+#: src/clients/inst_suse_register.ycp:161
msgid "Checking..."
msgstr ""

-#: src/clients/inst_suse_register.ycp:173
+#: src/clients/inst_suse_register.ycp:162
msgid "Error"
msgstr ""

-#: src/clients/inst_suse_register.ycp:174
+#: src/clients/inst_suse_register.ycp:163
msgid "An error occurred while connecting to the server."
msgstr ""

-#: src/clients/inst_suse_register.ycp:176
+#: src/clients/inst_suse_register.ycp:165
msgid "Error Message"
msgstr ""

-#: src/clients/inst_suse_register.ycp:177
+#: src/clients/inst_suse_register.ycp:166
msgid "Starting Browser..."
msgstr ""

@@ -1073,7 +1056,7 @@

#. }
#. dialog caption
-#: src/clients/installation.ycp:140 src/modules/AddOnProduct.ycp:917
+#: src/clients/installation.ycp:140 src/modules/AddOnProduct.ycp:915
msgid "Initializing..."
msgstr ""

@@ -1384,89 +1367,63 @@
msgid "Writing YaST Configuration..."
msgstr ""

-#. Scanning network for SLP servers
-#. translators: popup busy message
-#: src/include/add-on-workflow.ycp:65
-msgid "Scanning network..."
-msgstr ""
-
-#. error popup
-#: src/include/add-on-workflow.ycp:74
-msgid "No SLP catalogs found."
-msgstr ""
-
-#. translators: popup heading
-#: src/include/add-on-workflow.ycp:91
-msgid "Choose SLP Catalog"
-msgstr ""
-
-#. table header
-#: src/include/add-on-workflow.ycp:96
-msgid "Type"
-msgstr ""
-
-#. table header
-#: src/include/add-on-workflow.ycp:98
-msgid "URL"
-msgstr ""
-
#. radio button
-#: src/include/add-on-workflow.ycp:144
+#: src/include/add-on-workflow.ycp:61
msgid "&Scan Using SLP..."
msgstr ""

#. radio button
-#: src/include/add-on-workflow.ycp:146
+#: src/include/add-on-workflow.ycp:63
msgid "&FTP..."
msgstr ""

#. radio button
-#: src/include/add-on-workflow.ycp:148
+#: src/include/add-on-workflow.ycp:65
msgid "&HTTP..."
msgstr ""

#. radio button
-#: src/include/add-on-workflow.ycp:150
+#: src/include/add-on-workflow.ycp:67
msgid "HTT&PS..."
msgstr ""

#. radio button
-#: src/include/add-on-workflow.ycp:152
+#: src/include/add-on-workflow.ycp:69
msgid "&SMB/CIFS"
msgstr ""

#. radio button
-#: src/include/add-on-workflow.ycp:154
+#: src/include/add-on-workflow.ycp:71
msgid "&NFS..."
msgstr ""

#. radio button
-#: src/include/add-on-workflow.ycp:156 src/include/add-on-workflow.ycp:178
+#: src/include/add-on-workflow.ycp:73 src/include/add-on-workflow.ycp:95
msgid "&CD..."
msgstr ""

#. radio button
-#: src/include/add-on-workflow.ycp:158 src/include/add-on-workflow.ycp:180
+#: src/include/add-on-workflow.ycp:75 src/include/add-on-workflow.ycp:97
msgid "&DVD..."
msgstr ""

#. radio button
-#: src/include/add-on-workflow.ycp:160 src/include/add-on-workflow.ycp:182
+#: src/include/add-on-workflow.ycp:77 src/include/add-on-workflow.ycp:99
msgid "&Local Directory..."
msgstr ""

#. radio button
-#: src/include/add-on-workflow.ycp:162
+#: src/include/add-on-workflow.ycp:79
msgid "Specify &URL..."
msgstr ""

#. dialog caption
-#: src/include/add-on-workflow.ycp:189
+#: src/include/add-on-workflow.ycp:106
msgid "Add-On Product Media"
msgstr ""

#. help
-#: src/include/add-on-workflow.ycp:191
+#: src/include/add-on-workflow.ycp:108
msgid ""
"<p><big><b>Catalog Media</b></big><br>\n"
"Add-on products can be installed from CD, over a\n"
@@ -1474,7 +1431,7 @@
msgstr ""

#. help, continued
-#: src/include/add-on-workflow.ycp:197
+#: src/include/add-on-workflow.ycp:114
msgid ""
"<p>\n"
"To install add-on product from <b>CD</b>,\n"
@@ -1482,7 +1439,7 @@
msgstr ""

#. help, continued
-#: src/include/add-on-workflow.ycp:202
+#: src/include/add-on-workflow.ycp:119
msgid ""
"<p>\n"
"The product CDs can be copied to the hard disk.\n"
@@ -1493,7 +1450,7 @@
msgstr ""

#. help, continued
-#: src/include/add-on-workflow.ycp:211
+#: src/include/add-on-workflow.ycp:128
msgid ""
"<p>\n"
"Network installation requires a working network connection.\n"
@@ -1503,26 +1460,51 @@

#. yes-no popup
#. popup question
-#: src/include/add-on-workflow.ycp:245 src/include/add-on-workflow.ycp:423
-#: src/include/add-on-workflow.ycp:626 src/modules/AddOnProduct.ycp:815
+#: src/include/add-on-workflow.ycp:154 src/include/add-on-workflow.ycp:375
+#: src/include/add-on-workflow.ycp:512 src/modules/AddOnProduct.ycp:813
msgid "Really abort add-on product installation?"
msgstr ""

-#: src/include/add-on-workflow.ycp:287
+#. translators: popup busy message
+#: src/include/add-on-workflow.ycp:165
+msgid "Scanning network..."
+msgstr ""
+
+#. error popup
+#: src/include/add-on-workflow.ycp:171
+msgid "No SLP catalogs found."
+msgstr ""
+
+#. translators: popup heading
+#: src/include/add-on-workflow.ycp:185
+msgid "Choose SLP Catalog"
+msgstr ""
+
+#. table header
+#: src/include/add-on-workflow.ycp:190
+msgid "Type"
+msgstr ""
+
+#. table header
+#: src/include/add-on-workflow.ycp:192
+msgid "URL"
+msgstr ""
+
+#: src/include/add-on-workflow.ycp:245
msgid "Insert the add-on product CD"
msgstr ""

-#: src/include/add-on-workflow.ycp:295
+#: src/include/add-on-workflow.ycp:253
msgid "Insert the add-on product DVD"
msgstr ""

#. error report
-#: src/include/add-on-workflow.ycp:338
+#: src/include/add-on-workflow.ycp:294
msgid "No catalog found on medium."
msgstr ""

#. error report
-#: src/include/add-on-workflow.ycp:362 src/include/add-on-workflow.ycp:470
+#: src/include/add-on-workflow.ycp:315 src/include/add-on-workflow.ycp:416
msgid "Failed to initialize the catalog."
msgstr ""

@@ -1530,24 +1512,24 @@
#. place holder for unknown URL
#. placeholder for unknown path
#. placeholder for unknown URL
-#: src/include/add-on-workflow.ycp:385 src/include/add-on-workflow.ycp:390
-#: src/include/add-on-workflow.ycp:740 src/include/add-on-workflow.ycp:746
+#: src/include/add-on-workflow.ycp:337 src/include/add-on-workflow.ycp:342
+#: src/include/add-on-workflow.ycp:596 src/include/add-on-workflow.ycp:602
msgid "Unknown"
msgstr ""

#. table cell, %1 is URL, %2 is directory name
-#: src/include/add-on-workflow.ycp:388 src/include/add-on-workflow.ycp:744
+#: src/include/add-on-workflow.ycp:340 src/include/add-on-workflow.ycp:600
#, ycp-format
msgid "URL: %1, Directory: %2"
msgstr ""

#. dialog caption
-#: src/include/add-on-workflow.ycp:394
+#: src/include/add-on-workflow.ycp:346
msgid "Catalog Selection"
msgstr ""

#. help text
-#: src/include/add-on-workflow.ycp:396
+#: src/include/add-on-workflow.ycp:348
msgid ""
"<p><big><b>Catalog Selection</b></big><br>\n"
"There were multiple catalogs found on the selected medium.\n"
@@ -1555,39 +1537,32 @@
msgstr ""

#. popup message
-#: src/include/add-on-workflow.ycp:439
+#: src/include/add-on-workflow.ycp:391
msgid "Select a catalog."
msgstr ""

#. table cell
-#: src/include/add-on-workflow.ycp:510
+#: src/include/add-on-workflow.ycp:450
msgid "No product found in the catalog"
msgstr ""

#. message popup
-#: src/include/add-on-workflow.ycp:537
-msgid ""
-"The product on the media is already installed\n"
-"or selected for installation."
-msgstr ""
-
-#. message popup
-#: src/include/add-on-workflow.ycp:560
+#: src/include/add-on-workflow.ycp:465
msgid "Dependencies of the add-on product cannot be fullfilled."
msgstr ""

#. dialog caption
-#: src/include/add-on-workflow.ycp:599
+#: src/include/add-on-workflow.ycp:485
msgid "Product Selection"
msgstr ""

#. multi selection list
-#: src/include/add-on-workflow.ycp:603
+#: src/include/add-on-workflow.ycp:489
msgid "Available Products"
msgstr ""

#. help text
-#: src/include/add-on-workflow.ycp:607
+#: src/include/add-on-workflow.ycp:493
msgid ""
"<p><b><big>Product Selection</big></b><br>\n"
"There were multiple products found in the catalog. Select the products\n"
@@ -1595,39 +1570,44 @@
msgstr ""

#. message popup
-#: src/include/add-on-workflow.ycp:668
+#: src/include/add-on-workflow.ycp:529
msgid "Dependencies of the selected add-on products cannot be fullfilled."
msgstr ""

-#: src/include/add-on-workflow.ycp:749
+#. main screen heading
+#: src/include/add-on-workflow.ycp:589
+msgid "Add-On Product Installation"
+msgstr ""
+
+#: src/include/add-on-workflow.ycp:605
#, ycp-format
msgid "Product %1"
msgstr ""

#. table header
-#: src/include/add-on-workflow.ycp:754
+#: src/include/add-on-workflow.ycp:610
msgid "Media"
msgstr ""

#. table header
-#: src/include/add-on-workflow.ycp:756
+#: src/include/add-on-workflow.ycp:612
msgid "Product"
msgstr ""

#. message report
-#: src/include/add-on-workflow.ycp:785
+#: src/include/add-on-workflow.ycp:641
msgid "Select a product to delete."
msgstr ""

#. popup error
#. error report
-#: src/modules/AddOnProduct.ycp:769 src/modules/AddOnProduct.ycp:790
-#: src/modules/AddOnProduct.ycp:894
+#: src/modules/AddOnProduct.ycp:767 src/modules/AddOnProduct.ycp:788
+#: src/modules/AddOnProduct.ycp:892
msgid "An error occurred while preparing the installation system."
msgstr ""

#. error report
-#: src/modules/AddOnProduct.ycp:909
+#: src/modules/AddOnProduct.ycp:907
#, ycp-format
msgid "Control file %1 not found on media."
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.80/src/clients/inst_suse_register.ycp new/yast2-installation-2.13.81/src/clients/inst_suse_register.ycp
--- old/yast2-installation-2.13.80/src/clients/inst_suse_register.ycp 2006-04-19 12:59:51.000000000 +0200
+++ new/yast2-installation-2.13.81/src/clients/inst_suse_register.ycp 2006-04-20 16:25:01.000000000 +0200
@@ -54,6 +54,7 @@

map ui = UI::GetDisplayInfo();
boolean textmode = (boolean) ui["TextMode"]:nil;
+ boolean interactive = ! (textmode && Register::disable_w3m);

map argmap = GetInstArgs::argmap();

@@ -130,7 +131,11 @@
"No Web browser available
Run the suse_register command manually."
);
-
+ string no_w3m_msg = _(
+"Your registration requires interactive input that is not
+supported in text mode. Run YaST2 in the graphical mode or
+run the suse_register command manually."
+);

/* help text for dialog "Novell Customer Center Configuration" */
string help_title = sformat( "<p><b>%1</b></p>", title);
@@ -464,6 +469,12 @@
// add url to browser command
bcmd = bcmd + "'" + url + "'";

+ if (Register::use_proxy)
+ { // (#165891)
+ bcmd = " http_proxy='" + Register::http_proxy + "' " + bcmd;
+ bcmd = " https_proxy='" + Register::https_proxy + "' " + bcmd;
+ }
+
// in case of root add su call to not run a browser as root during installation
if ( Register::iamroot ) bcmd = su_exec("suse-ncc", "suse-ncc", bcmd );

@@ -582,7 +593,7 @@
// manual interaction is requiered
// this case MUST be first
// ... because during manual interaction further suse_register calls change the error code
- if (information_data["exit"]:"99" == "1")
+ if (information_data["exit"]:"99" == "1" && interactive)
{
UI::OpenDialog( manual_interaction );
UI::SetFocus (`id (`start_browser ));
@@ -657,10 +668,17 @@

if (mi_ret == `cancel) configure_status = false;
}
+ else if (information_data["exit"]:"99" == "1" && ! interactive)
+ {
+ // w3m disabled - show message
+ Popup::Message(no_w3m_msg);
+ loopend = true;
+ ret = `skip;
+ }
+
+ // during error code 1 information_data may be changed by a suse_register call
+ // no NO MORE suse_register calls below this line !!

- // NO ELSE CASE HERE!!!
- // ... because information_data may be changed during error code 1 case by a suse_register run
- // and therefor NO MORE suse_register calls below this line!!!

/* handle error codes from FIRST suse_register call AND from manual interaction */
if (information_data["exit"]:"99" == "3")
@@ -679,6 +697,12 @@
// no more interaction requiered - ZMD is configuered by suse_register
if (information_data["exit"]:"99" == "0")
{
+ // add update source
+ UI::OpenDialog(`VBox(`Label(_("Setting up online update source..."))));
+ Register::add_update_sources();
+ UI::CloseDialog();
+
+ // and then show success message
symbol sret=nil;
UI::OpenDialog( nccc_success );
repeat
@@ -698,10 +722,6 @@

// we are done, end of loop
loopend = true;
-
- UI::OpenDialog(`VBox(`Label(_("Setting up online update source..."))));
- Register::add_update_sources();
- UI::CloseDialog();
}


diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.80/src/modules/Register.ycp new/yast2-installation-2.13.81/src/modules/Register.ycp
--- old/yast2-installation-2.13.80/src/modules/Register.ycp 2006-04-19 12:59:51.000000000 +0200
+++ new/yast2-installation-2.13.81/src/modules/Register.ycp 2006-04-20 18:55:55.000000000 +0200
@@ -45,6 +45,10 @@
global boolean submit_hwdata = false;
global boolean force_registration = false;
global boolean display_forcereg = false;
+global boolean disable_w3m = false;
+global boolean use_proxy = false;
+global string http_proxy = "";
+global string https_proxy = "";

global map<string, string> registration_data = $[];

@@ -103,6 +107,12 @@
submit_hwdata = ProductFeatures::GetBooleanFeature("globals", "enable_register_hwdata");
// this boolean comes only from the control file - nowhere to be saved
display_forcereg = ProductFeatures::GetBooleanFeature("globals", "display_register_forcereg");
+ disable_w3m = ProductFeatures::GetBooleanFeature("globals", "disable_register_w3m");
+
+ // read proxy settings
+ use_proxy = (string) SCR::Read(.sysconfig.proxy.PROXY_ENABLED) == "yes" ? true:false;
+ http_proxy = (string) SCR::Read(.sysconfig.proxy.HTTP_PROXY);
+ https_proxy = (string) SCR::Read(.sysconfig.proxy.HTTPS_PROXY);

// then read from sysconfig
if (FileUtils::Exists("/etc/sysconfig/suse_register"))
@@ -207,6 +217,13 @@
if (parameter == `p) params = params + " -p ";
else params = params + sformat(" --dumpfile=%1 ", services_file);

+ string pre_sr = " umask 0077; ";
+ if (Register::use_proxy)
+ { // (#165891)
+ pre_sr = pre_sr + " http_proxy='" + Register::http_proxy + "' ";
+ pre_sr = pre_sr + " https_proxy='" + Register::https_proxy + "' ";
+ }
+
if (parameter == `autoyast)
{
// append values from map to the suse_register call
@@ -222,8 +239,8 @@
if ( !submit_optional ) params = params + " --no-optional ";

// run suse_register
- y2milestone ("Calling /usr/bin/suse_register %1", params);
- string sr_bash_cmd = sformat("umask 0077; /usr/bin/suse_register %1", params);
+ string sr_bash_cmd = sformat(" %1 /usr/bin/suse_register %2", pre_sr, params);
+ y2milestone ("Calling suse_register with command: %1", sr_bash_cmd);

map<string, string> response = $[];



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


< Previous Next >