Hello community,
here is the log from the commit of package yast2-registration
checked in at Wed Nov 1 01:32:27 CET 2006.
--------
--- yast2-registration/yast2-registration.changes 2006-10-04 09:18:43.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-registration/yast2-registration.changes 2006-10-31 22:22:07.000000000 +0100
@@ -1,0 +2,11 @@
+Tue Oct 31 21:57:57 CET 2006 - jdsn@suse.de
+
+- using own icon in installation workflow (#211552)
+- check for rug and zmd to be installed (#191135)
+- show message if no product to be registered (#191258)
+- avoid missing file error in log (#211899)
+- do not log sensitive data from autoyast (#195624)
+- renamed the _not_ missing file (inst_)suse_register.ycp
+- 2.13.3
+
+-------------------------------------------------------------------
Old:
----
yast2-registration-2.13.2.tar.bz2
New:
----
yast2-registration-2.13.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.mRP8ne/_old 2006-11-01 01:32:18.000000000 +0100
+++ /var/tmp/diff_new_pack.mRP8ne/_new 2006-11-01 01:32:18.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-registration (Version 2.13.2)
+# spec file for package yast2-registration (Version 2.13.3)
#
# 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-registration
-Version: 2.13.2
+Version: 2.13.3
Release: 1
-License: GPL
+License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-registration-2.13.2.tar.bz2
+Source0: yast2-registration-2.13.3.tar.bz2
prefix: /usr
Requires: yast2
Requires: suseRegister
@@ -38,7 +38,7 @@
J. Daniel Schmidt
%prep
-%setup -n yast2-registration-2.13.2
+%setup -n yast2-registration-2.13.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -82,6 +82,14 @@
/usr/share/YaST2/scrconf/cfg_suse_register.scr
%changelog -n yast2-registration
+* Tue Oct 31 2006 - jdsn@suse.de
+- using own icon in installation workflow (#211552)
+- check for rug and zmd to be installed (#191135)
+- show message if no product to be registered (#191258)
+- avoid missing file error in log (#211899)
+- do not log sensitive data from autoyast (#195624)
+- renamed the _not_ missing file (inst_)suse_register.ycp
+- 2.13.3
* Wed Oct 04 2006 - jsrain@suse.cz
- added missing inst_suse_register.ycp
- 2.13.2
++++++ yast2-registration-2.13.2.tar.bz2 -> yast2-registration-2.13.3.tar.bz2 ++++++
++++ 6658 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-registration-2.13.2/Makefile.am new/yast2-registration-2.13.3/Makefile.am
--- old/yast2-registration-2.13.2/Makefile.am 2006-10-04 09:17:39.000000000 +0200
+++ new/yast2-registration-2.13.3/Makefile.am 2006-10-31 22:20:30.000000000 +0100
@@ -7,8 +7,7 @@
#
#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -20,7 +19,7 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
@@ -34,7 +33,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
@@ -67,7 +66,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-registration-2.13.2/Makefile.am.common new/yast2-registration-2.13.3/Makefile.am.common
--- old/yast2-registration-2.13.2/Makefile.am.common 2006-10-04 09:17:39.000000000 +0200
+++ new/yast2-registration-2.13.3/Makefile.am.common 2006-10-31 22:20:30.000000000 +0100
@@ -29,7 +29,19 @@
dist-hook: check-syntax
+CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+ @if test "$(client_DATA)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.ycp,$^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+ exit 1; \
+ fi; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
+ fi
-include .dep
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-registration-2.13.2/VERSION new/yast2-registration-2.13.3/VERSION
--- old/yast2-registration-2.13.2/VERSION 2006-10-04 09:14:54.000000000 +0200
+++ new/yast2-registration-2.13.3/VERSION 2006-10-31 22:04:31.000000000 +0100
@@ -1 +1 @@
-2.13.2
+2.13.3
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-registration-2.13.2/configure.in new/yast2-registration-2.13.3/configure.in
--- old/yast2-registration-2.13.2/configure.in 2006-10-04 09:17:39.000000000 +0200
+++ new/yast2-registration-2.13.3/configure.in 2006-10-31 22:20:30.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-registration
dnl
-dnl -- This file is generated by y2autoconf 2.13.25 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-registration, 2.13.2, http://bugs.opensuse.org/, yast2-registration)
+AC_INIT(yast2-registration, 2.13.3, http://bugs.opensuse.org/, yast2-registration)
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.2"
+VERSION="2.13.3"
RPMNAME="yast2-registration"
MAINTAINER="J. Daniel Schmidt "
@@ -110,6 +110,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -142,6 +144,9 @@
if test "$YCPC" = "false"; then
AC_MSG_ERROR([ycpc is not installed])
fi
+AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
+ AC_MSG_WARN([yast2-testsuite.rpm is not installed])
+])
AC_CONFIG_FILES(Makefile agents/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-registration-2.13.2/src/clients/inst_suse_register.ycp new/yast2-registration-2.13.3/src/clients/inst_suse_register.ycp
--- old/yast2-registration-2.13.2/src/clients/inst_suse_register.ycp 2006-10-04 09:08:34.000000000 +0200
+++ new/yast2-registration-2.13.3/src/clients/inst_suse_register.ycp 2006-10-31 22:04:30.000000000 +0100
@@ -70,7 +70,7 @@
// Translators: Module Title for the Box
string title_box = _("Online Update Configuration"); // (#165509)
- // for SLES/SLED and SL (2 months after release) use title_nccc
+ // select title to use
string title = title_nccc;
// Translators: limit to 2x 50 charachters - if more needed take 3x 50 chars but NOTHING more
@@ -133,6 +133,11 @@
"No Web browser available.
Run the suse_register command manually."
);
+ string no_product_msg = _(
+"No product found to be registered.
+You do not need to register this installation.
+Please add update sources yourself."
+);
string no_w3m_msg = _(
"Your registration requires interactive input that is not
supported in text mode. Run YaST2 in the graphical mode or
@@ -418,6 +423,7 @@
// create a script to run a system call as different user
// thanks to werner (script) and jw (.screenrc.jail) for their help
+ // unset DESKTOP_SESSION : (#207332)
if (!textmode)
{ exec = exec +
"
@@ -427,6 +433,7 @@
disp=\"${DISPLAY}\"
fi
+unset DESKTOP_SESSION
: ${XAUTHORITY:=$HOME/.Xauthority}
if test ! -e $XAUTHORITY ; then
@@ -541,6 +548,7 @@
boolean enable_back = GetInstArgs::enable_back();
// we always need the next button
Wizard::SetContents (title, contents, help, enable_back, true);
+ Wizard::SetTitleIcon ("yast-product-registration"); // (#211552)
//y2debug ("%1", UI::DumpWidgetTree());
@@ -595,6 +603,7 @@
}
else if (ret == `showinfo)
{
+ Package::InstallAllMsg(["rug","zmd"], nil); // (#191135)
information_data = Register::suseRegister(`p);
if ( information_data["exit"]:"99" == "0" )
@@ -626,6 +635,7 @@
{
if ( configure_status == true )
{
+ Package::InstallAllMsg(["rug","zmd"], nil); // (#191135)
// remove the zmd flag file (requested by mvidner)
SCR::Execute(.target.bash, " rm -f /var/lib/zypp/zmd_updated_the_sources " );
@@ -774,6 +784,17 @@
}
+
+
+ // show a message when there are no products to register
+ if (information_data["exit"]:"99" == "101")
+ {
+ Popup::Message(no_product_msg);
+ loopend = true;
+ }
+
+
+
// error handling - no browser available for interactive mode
if (information_data["exit"]:"99" == "198")
{
@@ -788,6 +809,7 @@
information_data["exit"]:"" != "0" &&
information_data["exit"]:"" != "1" &&
information_data["exit"]:"" != "3" &&
+ information_data["exit"]:"" != "101" &&
information_data["exit"]:"" != "198"
) &&
!(
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-registration-2.13.2/src/clients/suse_register.ycp new/yast2-registration-2.13.3/src/clients/suse_register.ycp
--- old/yast2-registration-2.13.2/src/clients/suse_register.ycp 2006-10-04 08:58:41.000000000 +0200
+++ new/yast2-registration-2.13.3/src/clients/suse_register.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,857 +0,0 @@
-/**
- * File: installation/general/inst_suse_register
- * Module: Installation
- * Summary: Perform Customer Center Configuration
- * this includes (by calling suse_register):
- * machine registration
- * if needed, launch browser for user/customer registration
- * ZMD configuration
- * Authors: J. Daniel Schmidt
- *
- * Perform Customer Center Configuration
- *
- * $Id: inst_suse_register.ycp 1 2006-02-17 13:20:02Z jdsn $
- */
-
-{
- textdomain "installation";
-
- import "FileUtils";
- import "InstURL";
- import "URL";
- import "Wizard";
- import "Popup";
- import "GetInstArgs";
- import "CustomDialogs";
- import "Directory";
- import "Language";
- import "Mode";
- import "String";
- import "Label";
- import "Internet";
- import "Register";
- import "SourceManager";
- import "PackageSystem";
- import "Package";
-
- // no network - no suse_register
- if (!Mode::normal())
- {
- if (!Internet::suse_register)
- {
- Internet::do_you = false;
- return `auto;
- }
- }
-
- // error handling - skip if suseRegister is missing
- integer sr_exist = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/suse_register");
- if (sr_exist != 0)
- {
- y2milestone("/usr/bin/suse_register does not exist - skipping registration");
- Internet::do_you = false;
- return `auto;
- }
-
- // Register::initialize() is mandatory - never remove it
- Register::initialize();
-
- map ui = UI::GetDisplayInfo();
- boolean textmode = (boolean) ui["TextMode"]:nil;
- boolean interactive = ! (textmode && Register::disable_w3m);
-
- map argmap = GetInstArgs::argmap();
-
- /* strings for main (wizard) layout */
-
- // Translators: This is title/brand - verify how to translate it correctly
- string title_nccc = _("Novell Customer Center Configuration");
-
- // Translators: Module Title for the Box
- string title_box = _("Online Update Configuration"); // (#165509)
-
- // for SLES/SLED and SL (2 months after release) use title_nccc
- string title = title_nccc;
-
- // 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."
-);
-
- string nccc_configure = _("Configure Now (Recommended)");
- string nccc_noconfigure = _("Configure Later");
-
- 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...");
-
-
- /* strings for success popup */
- string nccc_success_msg = _("Your configuration was successful.");
- string nccc_success_server_added = _("An update server has been added to your configuration.");
- string success_detail_label =("New Update Server");
-
- /* strings for manual interaction popup */
- string mi_required = _("Manual Interaction Required");
- string mi_needinfo = _("Needed Information");
- string mi_browser_btn = _("Continue");
- string mi_start_browser = _(
-"A Web browser will start in which to complete
-the configuration on the opened Web site."
-);
-
-
- /* string for show information popup */
- string transmit_info = _("Registration and Privacy Information");
-
- /* strings for conflict popup */
- string conflict_need_info = _(
-"The server requires additional system information. Activating
-submission of the hardware profile automatically."
-);
-
- /* nonroot-message strings */
- string nonroot_title = _("Update Source Issues");
- string nonroot_message = _(
-"Registering as a regular user does not include the update source
-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: Data received is invalid.");
- string retrieve_error = _("Error: Could not retrieve data.");
- string no_browser_msg = _(
-"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);
-string help_para1 = _(
-"<p>
-Configure your system to enable online updates by registering it with Novell.
-To do this now, select <b>Configure Now</b>. Delay the registration with
-<b>Configure Later</b>.
-</p>"
-);
-
-string help_para2 = _(
-"<p>
-To simplify the registration process, include information from your system
-with <b>Optional Information</b> and <b>Hardware Profile</b>.
-<b>Details</b> shows the maximum amount of information that can be involved
- in your registration. To obtain this information, it contacts the Novell
-server to query what information is needed for your product. Only the identity
-of the installed product is sent in this initial exchange.
-</p>"
-);
-
-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 + (Register::display_forcereg ? help_para3:"") + help_para4;
-
-
-
- /* further strings */
- string checking = _("Checking...");
- string error = _("Error");
- string server_error = _("An error occurred while connecting to the server.");
- string details = _("Details...");
- string error_msg = _("Error");
- string starting_browser = _("Starting browser...");
-
- /* other string variables */
- map information_data = nil;
- string information_text = "";
-
-
- // default is true, see statement in layout term
- boolean configure_status = true;
-
- /* vv MAIN (WIZARD) LAYOUT vv */
- term sr_layout=nil;
- sr_layout=`HVCenter( `VBox(
- `Left (
- `RadioButtonGroup( `id(`sr_perform), `VBox(
- `Left ( `Label( nccc_top ) ),
- `VSpacing(1),
- `Left ( `RadioButton(`id(`noconfigure), `opt(`notify), nccc_noconfigure )),
- `Left ( `RadioButton(`id(`configure), `opt(`notify), nccc_configure, true )),
- `Left ( `id(`includeinfo), `HBox( `HSpacing( 3.0 ),
- `VBox (
- `VSpacing(0.5),
- `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 ) )
- ) ) ) ,
- `VSpacing(0.5)
- )))
- ));
-
- term contents = `VBox ( `VSpacing (0.5), sr_layout, `VSpacing (0.5));
- /* ^^ END MAIN LAYOUT ^^ */
-
-
-
- /* vv SHOW INFO POPUP vv */
- term showinformation = `HBox( `HSpacing(0.5),
- `MinSize( 75, 22 ,`VBox(
- `Label( transmit_info ),
- `RichText(`id(`information_text), information_text ),
- `PushButton (`id (`info_close), Label::CloseButton () ) )
- ),
- `HSpacing(0.5)
- );
- /* ^^ END SHOW INFO ^^ */
-
-
-
-
-
- /* vv MANUAL INTERACTION POPUP vv */
- term manual_interaction = //`HBox(
- `MinSize( 70, 25, `HBox( `VBox(
- `Left( `Label( `opt(`boldFont), mi_required ) ) ,
- `VSpacing(0.5) ,
- `Left( `Label( mi_start_browser ) ) ,
- `Left( `Label( mi_needinfo ) ) ,
- `RichText(`id(`needinfo), "" ),
- `HBox(
- `PushButton(`id(`start_browser), mi_browser_btn ) ,
- `HSpacing( 3),
- `PushButton(`id(`cancel), Label::CancelButton() )
- )
- ))
- );
- /* ^^ END MANUAL INTERACTION ^^ */
-
-
-
- /* vv CCC CONFLICT POPUP vv */
- term ccc_conflict=
- `VBox(
- `Left( `Label( `opt(`boldFont), title ) ),
- `VSpacing( 0.5 ),
- `Left( `Label( conflict_need_info ) ),
- `PushButton(`id(`ok), Label::OKButton())
- );
- /* ^^ END CCC CONFLICT ^^ */
-
-
- /* vv CCC ERROR POPUP vv */
- term error_message=
- `VBox(
- `Left( `Label( `opt(`boldFont), error ) ),
- `VSpacing( 0.5 ),
- `Left( `Label( `id(`err_description), server_error ) ),
- `HBox(
- `HWeight(1, `PushButton(`id(`ok), Label::OKButton() ) ),
- `HSpacing( 3 ),
- `HWeight(1, `PushButton(`id(`err_detail), details ) )
- )
- );
- /* ^^ END CCC ERROR ^^ */
-
-
- /* vv CCC ERROR POPUP vv */
- term error_message_details=
- `MinSize( 50, 15, `VBox(
- `Left( `Label( `opt(`boldFont), error_msg ) ),
- `VSpacing( 0.5 ),
- `RichText(`id(`errordetail), `opt(`plainText) , "" ),
- `PushButton(`id(`ok), Label::OKButton())
- ));
- /* ^^ END CCC ERROR ^^ */
-
-
-
- /* vv SUCCESS MESSAGE vv */
- term nccc_success=
- `VBox(
- `Left( `Label( `opt(`boldFont), title ) ),
- `VSpacing( 0.5 ),
- `Left( `Label( nccc_success_msg ) ),
- `Left( `Label( nccc_success_server_added ) ),
- `HBox(
- `HWeight(1, `PushButton(`id(`ok), Label::OKButton() ) ),
- `HSpacing( 3 ),
- `HWeight(1, `PushButton(`id(`success_detail), details ) )
- )
- );
- /* ^^ SUCCESS MESSAGE END ^^ */
-
-
-
- /* vv SUCCESS DETAILS vv */
- term nccc_success_detail=
- `MinSize( 60, 7, `VBox(
- `Left( `Label( `opt(`boldFont), success_detail_label ) ),
- `VSpacing( 0.5 ),
- `RichText(`id(`success_detail_richtext), `opt(`plainText) , "" ),
- `PushButton(`id(`ok), Label::OKButton())
- ));
- /* ^^ SUCCESS DETAILS END ^^ */
-
-
-/* ---------------------------------- LOCAL FUNCTIONS ------------------------------------------------------------ */
-
-
-boolean report_error()
-{
- // function to display an error message
- // and offer a detailled view of the error message
-
- UI::OpenDialog(error_message);
- UI::SetFocus (`id (`cancel ));
- symbol retry = nil;
-
- repeat
- {
- retry = (symbol) UI::UserInput();
-
- if ( retry == `cancel ) configure_status = false;
- else if (retry == `err_detail)
- {
- UI::OpenDialog(error_message_details);
- UI::ChangeWidget( `id(`errordetail), `Value, (string)information_data["stderr"]:"no error message available");
- UI::UserInput();
- UI::CloseDialog();
- }
- } until ( retry != `err_detail );
-
- UI::CloseDialog();
-}
-
-
-string su_exec(string user, string group, string command)
-{ // (#167255)
- string exec = sformat("
-#!/bin/bash -x
-
-user=%1
-group=%2
-cmd=\"%3\"
-
-fakehome=/var/lib/YaST2/$user-fakehome
-umask 0077
-
-XA=/root/.xauth
-mkdir -p $XA
-grep ^$user$ $XA/export >/dev/null 2>&1 || echo $user >> $XA/export
-
-mkdir -p $fakehome
-chmod 700 $fakehome
-tmp=$(mktemp $fakehome/.Xauthority.XXXXXX) || exit 1
-tmpjail=$(mktemp $fakehome/.screenrc.jail.XXXXXX) || exit 1
-chmod 600 $tmp $tmpjail
-chown $user:$group $tmp $tmpjail $fakehome
-trap \"rm -rf $fakehome\" EXIT INT HUP TERM
-
-cat > $tmpjail <http://www.opensuse.org");
- // deactivate force_registration after each suse_register call (#bugNo.)
- Register::force_registration = false;
-
- }
- else if ( mi_ret == `cancel )
- {
- recheck = false;
- mi_loopend = true;
- }
- else if ( is(mi_ret, string) )
- {
- // launch browser
- browserrun = launchBrowser( (string) mi_ret);
- recheck = false;
- }
-
-
- if ( recheck && browserrun )
- {
- // show the user, that we are doing something
- UI::ChangeWidget( `id(`needinfo), `Value, checking );
-
- information_data = Register::suseRegister(nil);
-
- if (information_data["exit"]:"99" == "0" || information_data["exit"]:"99" == "3" )
- {
- // error 0: everything is done, quit
- // error 3: madatory data conflict - handle outside of manual interaction
- mi_loopend = true;
- }
- else if (information_data["exit"]:"99" == "1")
- {
- // still needinfo, change displayed information and stay in manual interaction
- UI::ChangeWidget( `id(`needinfo), `Value, information_data["stderr"]:retrieve_error );
- }
- else
- {
- // unknown error, let the user find an exit :)
- mi_loopend = true;
- }
- }
-
-
- if (! browserrun )
- {
- information_data = $["exit":"198", "stdout":"", "stderr":"" ];
- mi_loopend = true;
- }
-
- } until ( mi_loopend );
-
- // we are done with manual interaction
- UI::CloseDialog();
-
- 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 !!
-
-
- /* handle error codes from FIRST suse_register call AND from manual interaction */
- if (information_data["exit"]:"99" == "3")
- {
- // error code 3 means:
- // conflict between transmitted data and data to be transmit according to customer contract
- // hwconfig is needed
- UI::OpenDialog(ccc_conflict);
- UI::SetFocus (`id (`ok));
- UI::UserInput();
- UI::CloseDialog();
- Register::submit_hwdata = true;
- }
-
- // error code 0 means: everything is OK
- // 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..."))));
- list<string> added = Register::add_update_sources();
- // #186978
- added = maplist (string u, added, ``(
- InstURL::HidePassword (u) ));
- UI::CloseDialog();
-
- // and then show success message
- symbol sret=nil;
- UI::OpenDialog( nccc_success );
- repeat
- {
- sret = (symbol) UI::UserInput();
- if (sret == `success_detail)
- {
- string text = mergestring (added, "\n");
- // Show the URLs that were added as update sources.
- // Not STDERR of suse_register output, we may have
- // declined some unsigned ones, #180820#c26.
- UI::OpenDialog( nccc_success_detail );
- UI::SetFocus(`id(`ok));
- UI::ChangeWidget(`id(`success_detail_richtext), `Value, text );
- UI::UserInput();
- UI::CloseDialog();
- }
- } until (sret == `ok );
- UI::CloseDialog();
-
- // we are done, end of loop
- loopend = true;
- }
-
-
- // error handling - no browser available for interactive mode
- if (information_data["exit"]:"99" == "198")
- {
- Popup::Message(no_browser_msg);
- loopend = true;
- }
-
-
- // handle any other error codes
- if (
- (
- information_data["exit"]:"" != "0" &&
- information_data["exit"]:"" != "1" &&
- information_data["exit"]:"" != "3" &&
- information_data["exit"]:"" != "198"
- ) &&
- !(
- // if return value says that suse_register was aborted by user
- information_data["exit"]:"99" == "199" &&
- information_data["stdout"]:"aborted" == "aborted" &&
- information_data["stderr"]:"aborted" == "aborted"
- )
- )
- {
- // display error message
- report_error();
- }
-
- }
- else
- {
- // skipping - no online update!!
- loopend = true;
- ret = `skip;
- }
- }
-
- // update main widget settings - they may have changed
- if (configure_status) UI::ChangeWidget(`id(`configure), `Value, true);
- else UI::ChangeWidget(`id(`noconfigure), `Value, true);
-
- // gray out if later is selected (#178042)
- UI::ChangeWidget(`id(`includeinfo), `Enabled, configure_status );
-
- UI::ChangeWidget(`id(`hwinfo), `Value, Register::submit_hwdata);
- // (#165841)
- if (Register::display_forcereg) UI::ChangeWidget( `id(`forcereg ), `Value, Register::force_registration );
-
- } until ( loopend || ret == `back );
-
- SourceManager::Unlock ();
-
- // Register::finish mandatory as well - do not remove
- Register::finish();
-
- if (Mode::normal())
- {
- // #172665
- Pkg::SourceFinishAll ();
- Pkg::TargetFinish ();
- Wizard::CloseDialog();
- }
- else
- {
- if (ret == `skip)
- {
- // skipping suse register - no online update
- Internet::do_you = false;
- ret = `next;
- }
- else
- {
- // ok we can do online update
- Internet::do_you = true;
- }
- }
-
- return (symbol)ret;
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-registration-2.13.2/src/config/customer_center.desktop new/yast2-registration-2.13.3/src/config/customer_center.desktop
--- old/yast2-registration-2.13.2/src/config/customer_center.desktop 2006-10-04 08:58:44.000000000 +0200
+++ new/yast2-registration-2.13.3/src/config/customer_center.desktop 2006-10-31 22:04:31.000000000 +0100
@@ -3,7 +3,7 @@
Type=Application
Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;
-X-SuSE-YaST-Call=suse_register
+X-SuSE-YaST-Call=inst_suse_register
X-SuSE-YaST-AutoInstClient=suse_register_auto
X-SuSE-YaST-RootOnly=false
X-SuSE-YaST-Group=Software
@@ -12,7 +12,7 @@
X-SuSE-YaST-AutoInstRequires=lan,proxy
Icon=yast-product-registration
-Exec=/sbin/yast2 suse_register
+Exec=/sbin/yast2 inst_suse_register
Name=Novell Customer Center Configuration
GenericName=Novell Customer Center Configuration
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-registration-2.13.2/src/config/suse_register.desktop new/yast2-registration-2.13.3/src/config/suse_register.desktop
--- old/yast2-registration-2.13.2/src/config/suse_register.desktop 2006-10-04 08:58:44.000000000 +0200
+++ new/yast2-registration-2.13.3/src/config/suse_register.desktop 2006-10-31 22:04:31.000000000 +0100
@@ -3,7 +3,7 @@
Type=Application
Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;
-X-SuSE-YaST-Call=suse_register
+X-SuSE-YaST-Call=inst_suse_register
X-SuSE-YaST-RootOnly=false
X-SuSE-YaST-Group=Software
X-SuSE-YaST-AutoInst=all
@@ -11,7 +11,7 @@
X-SuSE-YaST-AutoInstRequires=lan,proxy
Icon=yast-product-registration
-Exec=/sbin/yast2 suse_register
+Exec=/sbin/yast2 inst_suse_register
Name=Online Update Configuration
GenericName=Online Update Configuration
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-registration-2.13.2/src/modules/Register.ycp new/yast2-registration-2.13.3/src/modules/Register.ycp
--- old/yast2-registration-2.13.2/src/modules/Register.ycp 2006-10-04 08:58:45.000000000 +0200
+++ new/yast2-registration-2.13.3/src/modules/Register.ycp 2006-10-31 22:19:43.000000000 +0100
@@ -151,6 +151,8 @@
{
if (iamroot)
{
+ // avoid missing file error message in log (#211899)
+ SCR::Execute(.target.bash, "touch /etc/sysconfig/suse_register");
SCR::Write(.sysconfig.suse_register.SUBMIT_OPTIONAL, sformat("%1", submit_optional ? true:false ));
SCR::Write(.sysconfig.suse_register.SUBMIT_HWDATA, sformat("%1", submit_hwdata ? true:false ));
}
@@ -251,16 +253,6 @@
pre_sr = pre_sr + " https_proxy='" + Register::https_proxy + "' ";
}
- if (parameter == `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 ( force_registration ) params = params + " --force-registration ";
if ( !submit_hwdata ) params = params + " --no-hw-data ";
if ( !submit_optional ) params = params + " --no-optional ";
@@ -273,6 +265,16 @@
if (parameter == `autoyast)
{
+ // do not log sensitive data to the log (#195624)
+ // append values from map to the suse_register call
+ string params_sensitive = " ";
+ foreach (string key, string val, registration_data, {
+ key = String::CutRegexMatch(key, "[^A-Za-z0-9_-]+", true );
+ params_sensitive = params_sensitive + sformat(" -a %1='%2' ", key, String::Quote(val) );
+ });
+ sr_bash_cmd = sformat(" %1 %2 ", sr_bash_cmd, params_sensitive);
+ y2milestone ("called from autoyast - added sensitive registration data to suse_register call");
+
map info = (map) SCR::Execute(.target.bash_output, sr_bash_cmd );
string exitcode = sformat("%1", info["exit"]:99);
y2milestone ("/usr/bin/suse_register returned %1", exitcode);
@@ -291,7 +293,7 @@
// translators: busy popup while registering the system
string fixme_get_this_out_of_here_ASAP = _("This may take a while");
-
+
UI::OpenDialog(`VBox( `Left( `Label( _("Contacting server...")) ),
`Left( `Label( fixme_get_this_out_of_here_ASAP )), // (hmuelle, shorn)
`PushButton(`id(`abort), Label::AbortButton() )
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org