Hello community,
here is the log from the commit of package yast2-registration for openSUSE:Factory
checked in at Sat Oct 3 02:36:58 CEST 2009.
--------
--- yast2-registration/yast2-registration.changes 2008-12-01 18:22:03.000000000 +0100
+++ yast2-registration/yast2-registration.changes 2009-09-24 20:01:07.000000000 +0200
@@ -1,0 +2,41 @@
+Thu Sep 24 18:37:23 CEST 2009 - jdsn@suse.de
+
+- disable update repo restore because of bnc#449842
+- update cronjob support for auto license agreement (bnc#474573)
+- 2.18.0
+
+-------------------------------------------------------------------
+Wed Jul 8 14:48:32 CEST 2009 - ug@suse.de
+
+- Autoinst Resource in desktop file fixed
+
+-------------------------------------------------------------------
+Thu Apr 23 21:15:50 CEST 2009 - jdsn@suse.de
+
+- check boolean values also for nil to prevent crashes (bnc#463800)
+
+-------------------------------------------------------------------
+Mon Feb 23 12:50:14 CET 2009 - jdsn@suse.de
+
+- reload SourceManager after registration (bnc#468449)
+- do not force the refreshes during registration (bnc#476429)
+
+-------------------------------------------------------------------
+Tue Feb 17 21:46:59 CET 2009 - jdsn@suse.de
+
+- fix autoyast registration; fix ported from SLE11 (bnc#476494)
+- without network connection skip registration (bnc#475795)
+
+-------------------------------------------------------------------
+Tue Jan 27 17:35:44 CET 2009 - jdsn@suse.de
+
+- use OKDialog for online_update_configuration (bnc#440568)
+
+-------------------------------------------------------------------
+Mon Jan 26 17:48:44 CET 2009 - jdsn@suse.de
+
+- keep target initialized on exit (bnc#468449)
+- setup proxy before suseRegister initializes (bnc#468480)
+- setup http and https proxy settings individually (bnc#468919)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-registration-2.17.17.tar.bz2
New:
----
yast2-registration-2.18.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.6w98ko/_old 2009-10-03 02:34:44.000000000 +0200
+++ /var/tmp/diff_new_pack.6w98ko/_new 2009-10-03 02:34:44.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-registration (Version 2.17.17)
+# spec file for package yast2-registration (Version 2.18.0)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,13 @@
Name: yast2-registration
-Version: 2.17.17
+Version: 2.18.0
Release: 1
-License: GPL v2 or later
-Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-registration-2.17.17.tar.bz2
+Source0: yast2-registration-2.18.0.tar.bz2
Prefix: /usr
+Group: System/YaST
+License: GPL v2 or later
Requires: yast2 >= 2.17.0
Requires: yast2-packager >= 2.17.0
Requires: suseRegister
@@ -52,7 +52,7 @@
J. Daniel Schmidt
%prep
-%setup -n yast2-registration-2.17.17
+%setup -n yast2-registration-2.18.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -62,7 +62,9 @@
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
-make %{?jobs:-j%jobs}
+# V=1: verbose build in case we used AM_SILENT_RULES(yes)
+# so that RPM_OPT_FLAGS check works
+make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
++++++ yast2-registration-2.17.17.tar.bz2 -> yast2-registration-2.18.0.tar.bz2 ++++++
++++ 4520 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.17.17/Makefile.am new/yast2-registration-2.18.0/Makefile.am
--- old/yast2-registration-2.17.17/Makefile.am 2008-12-01 19:10:02.000000000 +0100
+++ new/yast2-registration-2.18.0/Makefile.am 2009-09-24 19:55:52.000000000 +0200
@@ -32,10 +32,10 @@
# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
-# where devtools instal m4 snippets
+# where devtools install m4 snippets
# argh, executed literally
#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
+ACLOCAL_AMFLAGS = -I . -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
cmp -s $< $@ || cp -f $< $@
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.17.17/VERSION new/yast2-registration-2.18.0/VERSION
--- old/yast2-registration-2.17.17/VERSION 2008-12-01 18:22:09.000000000 +0100
+++ new/yast2-registration-2.18.0/VERSION 2009-09-24 18:37:10.000000000 +0200
@@ -1 +1 @@
-2.17.17
+2.18.0
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.17.17/configure.in new/yast2-registration-2.18.0/configure.in
--- old/yast2-registration-2.17.17/configure.in 2008-12-01 19:10:01.000000000 +0100
+++ new/yast2-registration-2.18.0/configure.in 2009-09-24 19:55:52.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-registration
dnl
-dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.10 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-registration, 2.17.17, http://bugs.opensuse.org/, yast2-registration)
+AC_INIT(yast2-registration, 2.18.0, http://bugs.opensuse.org/, yast2-registration)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.17"
+VERSION="2.18.0"
RPMNAME="yast2-registration"
MAINTAINER="J. Daniel Schmidt "
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.17.17/src/clients/inst_suse_register.ycp new/yast2-registration-2.18.0/src/clients/inst_suse_register.ycp
--- old/yast2-registration-2.17.17/src/clients/inst_suse_register.ycp 2008-11-21 12:41:21.000000000 +0100
+++ new/yast2-registration-2.18.0/src/clients/inst_suse_register.ycp 2009-07-29 16:15:59.000000000 +0200
@@ -25,6 +25,7 @@
import "CustomDialogs";
import "Directory";
import "Mode";
+ import "Stage";
import "String";
import "Label";
import "Internet";
@@ -34,6 +35,7 @@
import "Package";
import "PackageCallbacks";
import "CommandLine";
+ import "NetworkService";
include "registration/texts.ycp";
@@ -62,9 +64,10 @@
}
// no network - no suse_register
- if (!Mode::normal() && !Internet::suse_register)
+ // test for existing network connection (bnc#475795)
+ if ( Stage::cont() && ( !Internet::suse_register || !NetworkService::isNetworkRunning() ) )
{
- y2error("The internet test failed or was skipped. So registration will not run.");
+ y2error("The internet test failed or no network connection is available. Registration will be skipped.");
Internet::do_you = false;
return `auto;
}
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.17.17/src/clients/online_update_configuration.ycp new/yast2-registration-2.18.0/src/clients/online_update_configuration.ycp
--- old/yast2-registration-2.17.17/src/clients/online_update_configuration.ycp 2008-12-01 18:20:57.000000000 +0100
+++ new/yast2-registration-2.18.0/src/clients/online_update_configuration.ycp 2009-09-24 18:27:51.000000000 +0200
@@ -54,22 +54,21 @@
string targetRootDir = Mode::normal() ? "/":Installation::destdir;
Pkg::TargetInit(targetRootDir, false); // (bnc#449844)
- // check if we are in installation workflow or running independently
- if (Mode::normal()) Wizard::CreateDialog();
+ // check if we are in installation workflow or running independently - use OKDialog (bnc#440568)
+ if (Mode::normal()) Wizard::OpenOKDialog();
// we always need the next button and never the back button
Wizard::SetContents (moduleTitle, contents, help, false, true);
Wizard::SetTitleIcon ("yast-online_update");
- Wizard::SetNextButton(`next, Label::FinishButton() );
/* -------------------------------- PROGRAM LOGIC START ----------------------------------------------------------- */
OnlineUpdateConfiguration::Read();
- if (false) // for testing only
- {
- OnlineUpdateConfiguration::currentUpdateRepo = "";
- }
+// if (false) // for testing only
+// {
+// OnlineUpdateConfiguration::currentUpdateRepo = "";
+// }
string replaceUpdateRepoString = OnlineUpdateConfiguration::currentUpdateRepo;
@@ -93,6 +92,7 @@
UI::ChangeWidget(`id(`automaticOnlineUpdate), `Value, OnlineUpdateConfiguration::enableAOU);
UI::ChangeWidget(`id(`updateInterval), `Value, OnlineUpdateConfiguration::updateInterval);
UI::ChangeWidget(`id(`skipInteractivePatches), `Value, OnlineUpdateConfiguration::skipInteractivePatches);
+ UI::ChangeWidget(`id(`autoAgreeWithLicenses), `Value, OnlineUpdateConfiguration::autoAgreeWithLicenses);
UI::RecalcLayout();
@@ -104,15 +104,16 @@
{
ret = Wizard::UserInput();
- if (ret == `next)
+ if ( ret == `next || ret == `ok )
{
OnlineUpdateConfiguration::updateInterval = (symbol) UI::QueryWidget(`id(`updateInterval), `Value );
OnlineUpdateConfiguration::skipInteractivePatches = (boolean) UI::QueryWidget(`id(`skipInteractivePatches), `Value );
+ OnlineUpdateConfiguration::autoAgreeWithLicenses = (boolean) UI::QueryWidget(`id(`autoAgreeWithLicenses), `Value );
OnlineUpdateConfiguration::enableAOU = (boolean) UI::QueryWidget(`id(`automaticOnlineUpdate), `Value );
y2milestone("Writing online update configuration settings.");
OnlineUpdateConfiguration::Write();
- //break;
+ ret = `next;
}
if ( ret == `restoreDefault )
@@ -187,8 +188,19 @@
UI::RecalcLayout();
}
+ if ( ret == `back || ret == `abort || ret == `cancel )
+ {
+ if ( Popup::ReallyAbort(true) )
+ {
+ break;
+ }
+ else
+ {
+ ret = `continue;
+ }
+ }
- } until (ret == `next || ret == `abort || ret == `cacel || ret == `back);
+ } until (ret == `ok || ret == `next || ret == `abort || ret == `cancel || ret == `back);
Pkg::SourceFinishAll();
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.17.17/src/clients/online_update_configuration_auto.ycp new/yast2-registration-2.18.0/src/clients/online_update_configuration_auto.ycp
--- old/yast2-registration-2.17.17/src/clients/online_update_configuration_auto.ycp 2008-09-12 09:34:55.000000000 +0200
+++ new/yast2-registration-2.18.0/src/clients/online_update_configuration_auto.ycp 2009-09-24 17:20:01.000000000 +0200
@@ -93,6 +93,9 @@
summary = Summary::AddHeader (summary, skipInteractivePatches);
summary = Summary::AddLine (summary, OnlineUpdateConfiguration::skipInteractivePatches ? enabledMsg:disabledMsg );
+
+ summary = Summary::AddHeader (summary, autoAgreeWithLicenses);
+ summary = Summary::AddLine (summary, OnlineUpdateConfiguration::autoAgreeWithLicenses ? enabledMsg:disabledMsg );
}
return summary;
@@ -122,6 +125,7 @@
UI::ChangeWidget(`id(`automaticOnlineUpdate), `Value, OnlineUpdateConfiguration::enableAOU);
UI::ChangeWidget(`id(`updateInterval), `Value, OnlineUpdateConfiguration::updateInterval);
UI::ChangeWidget(`id(`skipInteractivePatches), `Value, OnlineUpdateConfiguration::skipInteractivePatches);
+ UI::ChangeWidget(`id(`autoAgreeWithLicenses), `Value, OnlineUpdateConfiguration::autoAgreeWithLicenses);
UI::RecalcLayout();
@@ -135,6 +139,7 @@
{
OnlineUpdateConfiguration::updateInterval = (symbol) UI::QueryWidget(`id(`updateInterval), `Value );
OnlineUpdateConfiguration::skipInteractivePatches = (boolean) UI::QueryWidget(`id(`skipInteractivePatches), `Value );
+ OnlineUpdateConfiguration::autoAgreeWithLicenses = (boolean) UI::QueryWidget(`id(`autoAgreeWithLicenses), `Value );
OnlineUpdateConfiguration::enableAOU = (boolean) UI::QueryWidget(`id(`automaticOnlineUpdate), `Value );
break;
}
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.17.17/src/config/online_update_configuration.rnc new/yast2-registration-2.18.0/src/config/online_update_configuration.rnc
--- old/yast2-registration-2.17.17/src/config/online_update_configuration.rnc 2008-10-29 15:29:45.000000000 +0100
+++ new/yast2-registration-2.18.0/src/config/online_update_configuration.rnc 2009-09-24 18:32:47.000000000 +0200
@@ -2,11 +2,12 @@
namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
namespace config = "http://www.suse.com/1.0/configns"
-online_update_configuration = element online_update_configuration { enable_automatic_online_update? & skip_interactive_patches? & update_interval? }
+online_update_configuration = element online_update_configuration { enable_automatic_online_update? & skip_interactive_patches? & auto_agree_with_licenses? & update_interval? }
enable_automatic_online_update = element enable_automatic_online_update { BOOLEAN }
skip_interactive_patches = element skip_interactive_patches { BOOLEAN }
+auto_agree_with_licenses = element auto_agree_with_licenses { BOOLEAN }
update_interval = element update_interval { text }
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.17.17/src/config/suse_register.desktop new/yast2-registration-2.18.0/src/config/suse_register.desktop
--- old/yast2-registration-2.17.17/src/config/suse_register.desktop 2008-09-12 08:51:08.000000000 +0200
+++ new/yast2-registration-2.18.0/src/config/suse_register.desktop 2009-07-29 16:15:59.000000000 +0200
@@ -9,6 +9,7 @@
X-SuSE-YaST-AutoInstClonable=true
X-SuSE-YaST-AutoInstRequires=lan,proxy
X-SuSE-YaST-AutoInstSchema=registration.rnc
+X-SuSE-YaST-AutoInstResource=suse_register
Icon=yast-product-registration
Exec=/sbin/yast2 inst_suse_register
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.17.17/src/config/sysconfig.automatic_online_update-yast2-registration new/yast2-registration-2.18.0/src/config/sysconfig.automatic_online_update-yast2-registration
--- old/yast2-registration-2.17.17/src/config/sysconfig.automatic_online_update-yast2-registration 2008-09-12 06:06:16.000000000 +0200
+++ new/yast2-registration-2.18.0/src/config/sysconfig.automatic_online_update-yast2-registration 2009-09-24 18:34:15.000000000 +0200
@@ -23,4 +23,9 @@
AOU_SKIP_INTERACTIVE_PATCHES="true"
-
+## Type: boolean
+## Default: "false"
+#
+# Automatically agree with licenses.
+#
+AOU_AUTO_AGREE_WITH_LICENSES="false"
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.17.17/src/dialogs/OUCDialogs.ycp new/yast2-registration-2.18.0/src/dialogs/OUCDialogs.ycp
--- old/yast2-registration-2.17.17/src/dialogs/OUCDialogs.ycp 2008-09-12 08:28:49.000000000 +0200
+++ new/yast2-registration-2.18.0/src/dialogs/OUCDialogs.ycp 2009-09-24 18:22:48.000000000 +0200
@@ -13,6 +13,7 @@
textdomain "registration";
+import "OnlineUpdateConfiguration";
// module title
string moduleTitle = _("Online Update Configuration");
@@ -43,6 +44,7 @@
string sendDataToSmolt = _("Send hardware information to the smolt project");
string interval = _("Interval");
string skipInteractivePatches = _("Skip Interactive Patches");
+string autoAgreeWithLicenses = _("Agree with Licenses");
string currentUpdateRepo = _("Current Update Repository:");
string enabledMsg = _("enabled");
@@ -54,7 +56,8 @@
{
if (type == `autoyast)
{
- return help_title + help_para1 + help_para2 + help_para3 + help_para4;
+ //return help_title + help_para1 + help_para2 + help_para3 + help_para4;
+ return help_title + help_para4 + help_para3;
}
else
{
@@ -94,18 +97,27 @@
);
term autoOnlineUp = `VBox(
- `CheckBoxFrame(`id(`automaticOnlineUpdate), automaticOnlineUpdate, true,
- `HBox(
- `HStretch(),
- `ComboBox(`id(`updateInterval), interval, updateIntervals ),
- `HSpacing(3),
- `VBox( //align bottom
- `VSpacing(1),
- `CheckBox(`id(`skipInteractivePatches), skipInteractivePatches )
- ),
- `HStretch()
- )
- ));
+ `CheckBoxFrame(`id(`automaticOnlineUpdate), automaticOnlineUpdate, true,
+ `VBox(
+ `VSpacing(0.8),
+ `HBox(
+ `HStretch(),
+ `ComboBox(`id(`updateInterval), interval, updateIntervals ),
+ `HSpacing(3),
+ `VBox(
+ // `VSpacing(1.4),
+ `Left( `CheckBox(`id(`skipInteractivePatches), skipInteractivePatches, OnlineUpdateConfiguration::skipInteractivePatches == true ? true:false ) ),
+ `Left( `CheckBox(`id(`autoAgreeWithLicenses), autoAgreeWithLicenses, OnlineUpdateConfiguration::autoAgreeWithLicenses == true ? true:false ) )
+ ),
+ `HStretch()
+ ),
+ `VSpacing(0.8)
+ )
+ ),
+ `VSpacing(1),
+ `Right( `MenuButton( advancedMenuButtonLabel, expertMenu) )
+ );
+
term contents = nil;
@@ -115,8 +127,13 @@
}
else
{
- contents = `VBox( `VSpacing(1.5), upRepo,
- `VSpacing(1.5), autoOnlineUp, `VStretch(), `VSpacing(1.5) );
+ //contents = `VBox( `VSpacing(1.5), upRepo,
+ // `VSpacing(1.5), autoOnlineUp, `VStretch(), `VSpacing(1.5) );
+
+ // do not show the update repo restore section
+ // repos do not identify themselves yet as update repos, and products do not define their update repo ID
+ // can be reactivated when bnc#449842 is fixed and fully supported
+ contents = `VBox( `VSpacing(1.5), autoOnlineUp, `VStretch(), `VSpacing(1.5) );
}
return contents;
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.17.17/src/modules/OnlineUpdateConfiguration.ycp new/yast2-registration-2.18.0/src/modules/OnlineUpdateConfiguration.ycp
--- old/yast2-registration-2.17.17/src/modules/OnlineUpdateConfiguration.ycp 2008-11-27 22:29:36.000000000 +0100
+++ new/yast2-registration-2.18.0/src/modules/OnlineUpdateConfiguration.ycp 2009-09-24 17:33:11.000000000 +0200
@@ -20,6 +20,7 @@
global boolean enableAOU = false;
global boolean skipInteractivePatches = true;
+global boolean autoAgreeWithLicenses = false;
global symbol updateInterval = `weekly;
global boolean OUCmodified = false;
@@ -64,7 +65,7 @@
//FIXME: otherwise restoring of the default update repo is only possible via NCC registration
/*
productDetail[0, "category"]="base";
-productDetail[0, "update_urls"] = ["http://download.opensuse.org/update/11.1/"];
+productDetail[0, "update_urls"] = ["http://download.opensuse.org/update/11.2/"];
*/
//FIXME END
@@ -456,6 +457,7 @@
// only the fact that a cronjob exists makes this setting true
enableAOU = ( interD >= 0 || interW >= 0 || interM >= 0 );
skipInteractivePatches = ( (string)SCR::Read(.sysconfig.automatic_online_update.AOU_SKIP_INTERACTIVE_PATCHES) == "true" ) ? true:false;
+ autoAgreeWithLicenses = ( (string)SCR::Read(.sysconfig.automatic_online_update.AOU_AUTO_AGREE_WITH_LICENSES) == "true" ) ? true:false;
}
@@ -471,6 +473,7 @@
enableAOU = (boolean) settings["enable_automatic_online_update"]:enableAOU;
skipInteractivePatches = (boolean) settings["skip_interactive_patches"]:skipInteractivePatches;
+ autoAgreeWithLicenses = (boolean) settings["auto_agree_with_licenses"]:autoAgreeWithLicenses;
string getInterval = (string) settings["update_interval"]:"";
@@ -488,8 +491,9 @@
*/
global boolean Write()
{
- SCR::Write(.sysconfig.automatic_online_update.AOU_ENABLE_CRONJOB , (enableAOU ? "true":"false") );
- SCR::Write(.sysconfig.automatic_online_update.AOU_SKIP_INTERACTIVE_PATCHES, (skipInteractivePatches ? "true":"false") );
+ SCR::Write(.sysconfig.automatic_online_update.AOU_ENABLE_CRONJOB , (enableAOU == true ? "true":"false") );
+ SCR::Write(.sysconfig.automatic_online_update.AOU_SKIP_INTERACTIVE_PATCHES, (skipInteractivePatches == true ? "true":"false") );
+ SCR::Write(.sysconfig.automatic_online_update.AOU_AUTO_AGREE_WITH_LICENSES, (autoAgreeWithLicenses == true ? "true":"false") );
if (enableAOU)
{
@@ -522,6 +526,7 @@
return $[
"enable_automatic_online_update":enableAOU,
"skip_interactive_patches":skipInteractivePatches,
+ "auto_agree_with_licenses":autoAgreeWithLicenses,
"update_interval":intervalSymbolToString(updateInterval)
];
}
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.17.17/src/modules/Register.ycp new/yast2-registration-2.18.0/src/modules/Register.ycp
--- old/yast2-registration-2.17.17/src/modules/Register.ycp 2008-11-21 12:49:20.000000000 +0100
+++ new/yast2-registration-2.18.0/src/modules/Register.ycp 2009-07-29 16:15:59.000000000 +0200
@@ -784,11 +784,11 @@
*/
void write_config()
{
- 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 ));
+ SCR::Write(.sysconfig.suse_register.SUBMIT_OPTIONAL, sformat("%1", submit_optional == true ? true:false ));
+ SCR::Write(.sysconfig.suse_register.SUBMIT_HWDATA, sformat("%1", submit_hwdata == true ? true:false ));
if ( register_regularly == nil ) register_regularly = false;
- SCR::Execute(.target.bash, sformat("%1 /var/lib/suseRegister/neverRegisterOnBoot", register_regularly ? "rm -f ":"touch " ));
+ SCR::Execute(.target.bash, sformat("%1 /var/lib/suseRegister/neverRegisterOnBoot", register_regularly == true ? "rm -f ":"touch " ));
// touch a flag file for opensuseupdater
SCR::Execute(.target.bash, sformat("touch /var/lib/YaST2/registrationDidRun"));
}
@@ -907,19 +907,6 @@
// reset YSRs context
YSR::del_ctx();
isInitializedSR = false;
- if ( isInitializedTarget )
- {
- y2milestone("Package target was initialized. Now finishing target usage.");
- if ( Pkg::TargetFinish() )
- {
- y2milestone("Successfully finished the target usage of the package system.");
- isInitializedTarget = false;
- }
- else
- {
- y2error("Could not finish the target usage of the package system.");
- }
- }
}
@@ -1329,7 +1316,8 @@
list<integer> currentNewSources = Pkg::SourceGetCurrent( true );
foreach (integer srcID, currentNewSources, {
y2milestone("Refreshing source with ID: %1", srcID);
- Pkg::SourceForceRefreshNow(srcID);
+ // no "forced" refresh needed - default is sufficient (bnc#476429)
+ Pkg::SourceRefreshNow(srcID);
});
}
}
@@ -1337,7 +1325,18 @@
// finish sources (bnc#447080)
if ( Pkg::SourceFinishAll() )
{
- y2milestone("Successfully finished all sources.");
+ y2milestone("Successfully finished all sources to enforce a reload.");
+
+ // restart the SourceManager to refill the cache with the current data (bnc#468449)
+ // an application that called the registration (or that follows it) should be presented an updated pkg system
+ if ( Pkg::SourceStartManager(true) )
+ {
+ y2milestone("Successfully restarted source manager.");
+ }
+ else
+ {
+ y2error("Failed to restart source manager");
+ }
}
else
{
@@ -1346,7 +1345,7 @@
if ( repoUpdateSuccessful )
{
- y2error("SuseRegister will now save the lastZmdConfig.");
+ y2milestone("SuseRegister will now save the lastZmdConfig.");
YSR::saveLastZmdConfig();
}
else
@@ -1371,11 +1370,12 @@
map ui = UI::GetDisplayInfo();
boolean debugMode = (boolean) ui["y2debug"]:false;
+ // take care for nil booleans (bnc#463800)
map contextData = $[
- "debug" : (debugMode ? 2:0),
- "nooptional" : (submit_optional ? 0:1),
- "nohwdata" : (submit_hwdata ? 0:1),
- "forcereg" : (force_registration ? 1:0), // (bnc#443704)
+ "debug" : (debugMode == true ? 2:0),
+ "nooptional" : (submit_optional == true ? 0:1),
+ "nohwdata" : (submit_hwdata == true ? 0:1),
+ "forcereg" : (force_registration == true ? 1:0), // (bnc#443704)
"norefresh" : 1,
"yastcall" : 1,
"restoreRepos" : 1, // (#309231)
@@ -1387,12 +1387,17 @@
if ( registration_data != $[] )
{
// append sensitive data to the context map
+ // collect data inside of the args keyword (bnc#476494)
+ contextData["args"] = registration_data;
+
+ // do not log sensitive data to the log (#195624)
+ y2milestone("Added sensitive registration data to suse_register call - the data will not be logged, only the used keys");
+
+ // list the used keys in the log
foreach (string key, string val, registration_data, {
- key = String::CutRegexMatch(key, "[^A-Za-z0-9_-]+", true );
- contextData[key] = sformat("%1", String::Quote(val));
+ y2milestone("Added sensitive registration data for the key: %1", key);
});
- // do not log sensitive data to the log (#195624)
- y2milestone ("Added sensitive registration data to suse_register call - this data is not logged");
+
}
@@ -1401,7 +1406,7 @@
// initialize target
if ( ! isInitializedTarget )
{
- string targetRootDir = Mode::normal() ? "/":Installation::destdir;
+ string targetRootDir = Mode::normal() == true ? "/":Installation::destdir;
if ( ! Pkg::TargetInitialize(targetRootDir) )
{
y2error("Initializing the target failed via Pkg::TargetInitialize. No interaction with the package system is possible.");
@@ -1438,7 +1443,8 @@
foreach ( integer srcID, allCurrentSources, {
y2milestone("Refreshing source with ID: %1", srcID);
- Pkg::SourceForceRefreshNow(srcID);
+ // no "forced" refresh needed - default is sufficient (bnc#476429)
+ Pkg::SourceRefreshNow(srcID);
});
y2milestone("Initial refreshing ended.");
@@ -1446,6 +1452,34 @@
// Pkg::CallbackAuthentication(nil);
}
+ // setting the proxy must happen before init_ctx is called (bnc#468480)
+ // setting up proxy for SuseRegister
+ if (Register::use_proxy)
+ {
+ // setup proxy for http and https individually (bnc#468919)
+ if (Register::http_proxy == nil)
+ {
+ Register::http_proxy = "";
+ y2error("Setting for http proxy is broken. Resetting http proxy. Registration will not use an http proxy.");
+ }
+
+ if (Register::https_proxy == nil)
+ {
+ Register::https_proxy = "";
+ y2error("Setting for https proxy is broken. Resetting https proxy. Registration will not use an https proxy.");
+ }
+
+ if (Register::http_proxy != "" || Register::https_proxy != "")
+ {
+ y2milestone("Setting up proxy for SuseRegister. http_proxy: %1 -- https_proxy: %2", Register::http_proxy, Register::https_proxy);
+ YSR::set_proxy(Register::http_proxy, Register::https_proxy);
+ }
+ else
+ {
+ y2milestone("No proxy settings will be used for registration and SuseRegister.");
+ }
+ }
+
// initialize SuseRegister
contextDataSR = contextData;
y2milestone("Initializing SuseRegister with this context data: %1", contextDataSR);
@@ -1462,20 +1496,6 @@
y2error("Initializing SuseRegister failed with error code (%1) and error message: %2", initErrorCode, YSR::get_errormsg());
return initErrorCode;
}
-
- // setting up proxy for SuseRegister
- if (Register::use_proxy)
- {
- if (Register::http_proxy != nil && Register::https_proxy != nil)
- {
- y2milestone("Setting up proxy for SuseRegister. http_proxy: %1 -- https_proxy: %2", Register::http_proxy, Register::https_proxy);
- YSR::set_proxy(Register::http_proxy, Register::https_proxy);
- }
- else
- {
- y2error("Proxy settings are broken and could not be applied to SuseRegister.");
- }
- }
}
// ----==== handle modes for suseRegister ====----
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.17.17/src/scripts/online_update new/yast2-registration-2.18.0/src/scripts/online_update
--- old/yast2-registration-2.17.17/src/scripts/online_update 2008-09-11 16:56:26.000000000 +0200
+++ new/yast2-registration-2.18.0/src/scripts/online_update 2009-09-24 18:49:02.000000000 +0200
@@ -4,6 +4,7 @@
upcmd="/bin/false"
syscfgfile="/etc/sysconfig/automatic_online_update"
skipInteractive="--skip-interactive"
+autoAgreeWithLicenses=""
if [ -x ${zyppercmd} ]
then
@@ -20,28 +21,29 @@
fi
-if [ ! -z $AOU_ENABLE_CRONJOB ]
+if [ ! $AOU_ENABLE_CRONJOB = "true" ]
then
- if [ ! $AOU_ENABLE_CRONJOB = "true" ]
- then
- echo "Online Update is disabled in ${syscfgfile}. Will not run update."
- exit 0
- fi
+ echo "Online Update is disabled in ${syscfgfile}. Will not run update."
+ exit 0
fi
+if [ ${AOU_SKIP_INTERACTIVE_PATCHES} = "true" ]
+then
+ skipInteractive="--skip-interactive"
+else
+ skipInteractive=
+fi
-if [ ! -z ${AOU_SKIP_INTERACTIVE_PATCHES} ]
+
+if [ ${AOU_AUTO_AGREE_WITH_LICENSES} = "true" ]
then
- if [ ${AOU_SKIP_INTERACTIVE_PATCHES} = "true" ]
- then
- skipInteractive="--skip-interactive"
- else
- skipInteractive=
- fi
+ autoAgreeWithLicenses="--auto-agree-with-licenses"
+else
+ autoAgreeWithLicenses=
fi
# run the update
-${upcmd} --quiet up -y -t patch ${skipInteractive}
+${upcmd} --quiet up -y -t patch ${skipInteractive} ${autoAgreeWithLicenses}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org