Hello community,
here is the log from the commit of package yast2-registration
checked in at Fri Sep 12 17:30:31 CEST 2008.
--------
--- yast2-registration/yast2-registration.changes 2008-05-30 08:26:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-registration/yast2-registration.changes 2008-09-12 15:00:28.992799000 +0200
@@ -1,0 +2,12 @@
+Fri Sep 12 14:57:48 CEST 2008 - jdsn@suse.de
+
+- new module for online update configuration (fate#303458)
+- simplifying/cleaning up sw management (fate#303458)
+- 2.17.0
+
+-------------------------------------------------------------------
+Tue Jul 1 16:02:14 CEST 2008 - jdsn@suse.de
+
+- removed unused GetInstArgs call
+
+-------------------------------------------------------------------
Old:
----
yast2-registration-2.16.7.tar.bz2
New:
----
yast2-registration-2.17.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.W22636/_old 2008-09-12 17:30:01.000000000 +0200
+++ /var/tmp/diff_new_pack.W22636/_new 2008-09-12 17:30:01.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package yast2-registration (Version 2.16.7)
+# spec file for package yast2-registration (Version 2.17.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -12,12 +19,12 @@
Name: yast2-registration
-Version: 2.16.7
+Version: 2.17.0
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-registration-2.16.7.tar.bz2
+Source0: yast2-registration-2.17.0.tar.bz2
Prefix: /usr
Requires: yast2 >= 2.16.6
Requires: suseRegister
@@ -44,7 +51,7 @@
J. Daniel Schmidt
%prep
-%setup -n yast2-registration-2.16.7
+%setup -n yast2-registration-2.17.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -86,17 +93,28 @@
/usr/share/YaST2/modules/*.pm
/usr/share/YaST2/modules/*.ycp
/usr/share/YaST2/modules/*.ybc
+%dir /usr/share/YaST2/include/registration
+/usr/share/YaST2/include/registration/*.ycp
%{prefix}/share/applications/YaST2/*.desktop
/usr/share/YaST2/schema/autoyast/rnc/registration.rnc
+/usr/share/YaST2/schema/autoyast/rnc/automatic_online_update.rnc
+/usr/lib/YaST2/bin/online_update
/usr/share/YaST2/yastbrowser
%dir /usr/share/YaST2/control
/usr/share/YaST2/control/*.xml
# agents
/usr/share/YaST2/scrconf/cfg_suse_register.scr
+/usr/share/YaST2/scrconf/cfg_automatic_online_update.scr
#fillup
/var/adm/fillup-templates/sysconfig.suse_register-yast2-registration
-
+/var/adm/fillup-templates/sysconfig.automatic_online_update-yast2-registration
%changelog
+* Fri Sep 12 2008 jdsn@suse.de
+- new module for online update configuration (fate#303458)
+- simplifying/cleaning up sw management (fate#303458)
+- 2.17.0
+* Tue Jul 01 2008 jdsn@suse.de
+- removed unused GetInstArgs call
* Fri May 30 2008 lslezak@suse.cz
- initialize the target to read the GPG keys (bnc#394662)
- 2.16.7
++++++ yast2-registration-2.16.7.tar.bz2 -> yast2-registration-2.17.0.tar.bz2 ++++++
++++ 2036 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.16.7/agents/cfg_automatic_online_update.scr new/yast2-registration-2.17.0/agents/cfg_automatic_online_update.scr
--- old/yast2-registration-2.16.7/agents/cfg_automatic_online_update.scr 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-2.17.0/agents/cfg_automatic_online_update.scr 2008-09-11 16:43:27.000000000 +0200
@@ -0,0 +1,19 @@
+/**
+ * File:
+ * cfg_automatic_online_update.scr
+ * Summary:
+ * Agent to read and write /etc/sysconfig/automatic_online_update
+ * using ini agent
+ * Authors:
+ * Jens Daniel Schmidt
+ *
+ * $Id: cfg_automatic_online_update.scr 1 2008-09-10 09:48:10Z jdsn $
+ *
+ * Read and write the settings in /etc/sysconfig/automatic_online_update
+ * needed by installation/inst_suse_register
+ */
+.sysconfig.automatic_online_update
+
+`ag_ini(
+ `SysConfigFile("/etc/sysconfig/automatic_online_update")
+)
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.16.7/configure.in new/yast2-registration-2.17.0/configure.in
--- old/yast2-registration-2.16.7/configure.in 2008-05-30 08:04:45.000000000 +0200
+++ new/yast2-registration-2.17.0/configure.in 2008-09-12 15:32:17.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-registration
dnl
-dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-registration, 2.16.7, http://bugs.opensuse.org/, yast2-registration)
+AC_INIT(yast2-registration, 2.17.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.16.7"
+VERSION="2.17.0"
RPMNAME="yast2-registration"
MAINTAINER="J. Daniel Schmidt "
@@ -156,11 +156,13 @@
src/clients/Makefile
src/config/Makefile
src/control/Makefile
+src/dialogs/Makefile
src/yastbrowser/chrome/Makefile
src/yastbrowser/components/Makefile
src/yastbrowser/defaults/preferences/Makefile
src/yastbrowser/defaults/Makefile
src/yastbrowser/Makefile
+src/scripts/Makefile
src/Makefile)
AC_OUTPUT
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.16.7/src/clients/inst_suse_register.ycp new/yast2-registration-2.17.0/src/clients/inst_suse_register.ycp
--- old/yast2-registration-2.16.7/src/clients/inst_suse_register.ycp 2008-05-30 08:00:42.000000000 +0200
+++ new/yast2-registration-2.17.0/src/clients/inst_suse_register.ycp 2008-09-12 09:08:47.000000000 +0200
@@ -69,8 +69,6 @@
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
@@ -81,19 +79,34 @@
// alternative short title text
string title_short = _("Registration");
+ string title_long = _("Support Registration");
// select title to use
- // set default title
- string title = title_nccc;
-
- // lets see if the control center uses the box text and no customer center desktop file is there (#294454)
- if ( (integer) SCR::Execute(.target.bash, " grep -isq \"^Name=Online Update Configuration\" /usr/share/applications/YaST2/suse_register.desktop && ! [ -e /usr/share/applications/YaST2/customer_center.desktop ] ") == 0 ? true:false )
- title = title_box;
+ // use new default title
+ string title = title_short;
// 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.");
+ // Translators: limit to 2x 50 charachters - if more needed take 3x 50 chars but NOTHING more
+ string opensuse_top = _("Get technical support and product updates
+by registering this installation.");
+
+
+ string nccc_heading = "";
+ // if we are SLES then switch to NCCC title (#294454)
+ if ( (integer) SCR::Execute(.target.bash, " [ -e /usr/share/applications/YaST2/customer_center.desktop ] ") == 0 ? true:false )
+ {
+ title = title_nccc;
+ nccc_heading = nccc_top;
+ }
+ else
+ {
+ title = title_short;
+ nccc_heading = opensuse_top;
+ }
+
string nccc_configure = _("Configure Now (Recommended)");
string nccc_noconfigure = _("Configure Later");
@@ -214,7 +227,7 @@
sr_layout = `HVSquash(
`VBox(
- `Label( nccc_top ),
+ `Label( nccc_heading ),
`VSpacing(0.5),
`Frame( title,
`RadioButtonGroup( `id(`sr_perform),
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.16.7/src/clients/online_update_configuration_auto.ycp new/yast2-registration-2.17.0/src/clients/online_update_configuration_auto.ycp
--- old/yast2-registration-2.16.7/src/clients/online_update_configuration_auto.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-2.17.0/src/clients/online_update_configuration_auto.ycp 2008-09-12 09:34:55.000000000 +0200
@@ -0,0 +1,229 @@
+/**
+ * File: online_update_configuration
+ * Module: Registration
+ * Summary: Configure Online Update
+ * Authors: J. Daniel Schmidt
+ *
+ * Configure Online Update Settings
+ *
+ * $Id: online_update_configuration.ycp 1 2008-09-10 13:20:02Z jdsn $
+ */
+
+{
+ textdomain "registration";
+
+ import "OnlineUpdateConfiguration";
+ import "Wizard";
+ import "Popup";
+ import "Label";
+ import "URL";
+ import "Mode";
+ import "Summary";
+/*
+ import "FileUtils";
+ import "SourceManager";
+ import "Package";
+ import "PackageCallbacks";
+*/
+
+ include "registration/OUCDialogs.ycp";
+
+
+/**
+ * Get all setting
+ * @param settings The YCP structure to be imported.
+ * @return boolean True on success
+ */
+boolean Import (map settings)
+{
+ y2debug("Import called, settings: %1", settings);
+ return OnlineUpdateConfiguration::Import(settings);
+}
+
+
+/**
+ * Export the settings to a single map
+ * (For use by autoinstallation.)
+ */
+map Export ()
+{
+ y2debug("Export called");
+ return OnlineUpdateConfiguration::Export();
+}
+
+
+/**
+ * Write all settings
+ * @return true on success
+ */
+boolean Write()
+{
+ return OnlineUpdateConfiguration::Write();
+}
+
+
+void Read()
+{
+ OnlineUpdateConfiguration::Read();
+}
+
+map AutoPackages()
+{
+ return $[ "install":[], "remove":[] ];
+}
+
+
+
+
+/**
+ * Create a textual summary and a list of unconfigured cards
+ * @return summary of the current configuration
+ */
+string Summary()
+{
+ string summary = "";
+
+ summary = Summary::AddHeader (summary, automaticOnlineUpdate);
+ summary = Summary::AddLine (summary, OnlineUpdateConfiguration::enableAOU ? enabledMsg:disabledMsg );
+
+ if (OnlineUpdateConfiguration::enableAOU)
+ {
+ summary = Summary::AddHeader (summary, interval);
+ summary = Summary::AddLine (summary, OnlineUpdateConfiguration::intervalSymbolToString(OnlineUpdateConfiguration::updateInterval) );
+
+ summary = Summary::AddHeader (summary, skipInteractivePatches);
+ summary = Summary::AddLine (summary, OnlineUpdateConfiguration::skipInteractivePatches ? enabledMsg:disabledMsg );
+ }
+
+ return summary;
+}
+
+
+
+
+/* --------------------------------------------------------------------------------------------------------------- */
+
+symbol OUC_configure()
+{
+ string help = getOUCHelp(`autoyast);
+ term contents = getOUCDialog(`autoyast);
+
+
+ Wizard::CreateDialog();
+
+ // 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() );
+
+ //OnlineUpdateConfiguration::Read();
+
+ // write settings to the UI
+ UI::ChangeWidget(`id(`automaticOnlineUpdate), `Value, OnlineUpdateConfiguration::enableAOU);
+ UI::ChangeWidget(`id(`updateInterval), `Value, OnlineUpdateConfiguration::updateInterval);
+ UI::ChangeWidget(`id(`skipInteractivePatches), `Value, OnlineUpdateConfiguration::skipInteractivePatches);
+
+ UI::RecalcLayout();
+
+ any ret=`auto;
+
+ repeat
+ {
+ ret = Wizard::UserInput();
+
+ if (ret == `next)
+ {
+ OnlineUpdateConfiguration::updateInterval = (symbol) UI::QueryWidget(`id(`updateInterval), `Value );
+ OnlineUpdateConfiguration::skipInteractivePatches = (boolean) UI::QueryWidget(`id(`skipInteractivePatches), `Value );
+ OnlineUpdateConfiguration::enableAOU = (boolean) UI::QueryWidget(`id(`automaticOnlineUpdate), `Value );
+ break;
+ }
+
+ } until (ret == `next || ret == `abort || ret == `cacel || ret == `back);
+
+ if (! is(ret, symbol)) ret = `next;
+
+ Wizard::CloseDialog();
+ return (symbol)ret;
+
+}
+
+
+
+
+
+//---------------------------------------------------------------------------
+// MAIN
+//---------------------------------------------------------------------------
+y2milestone("----------------------------------------");
+y2milestone("online_update_configuration_auto started");
+
+
+any ret = nil;
+string func = "";
+map param = $[];
+
+/* Check arguments */
+if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) {
+ func = (string)WFM::Args(0);
+ if(size(WFM::Args()) > 1 && is(WFM::Args(1), map))
+ param = (map) WFM::Args(1);
+}
+
+y2milestone("func=%1", func);
+y2milestone("param=%1", param);
+
+/* Create a summary*/
+if(func == "Summary") {
+ ret = Summary();
+}
+/* Reset configuration */
+else if (func == "Reset") {
+ Import($[]);
+ ret = $[];
+}
+/* Change configuration (run AutoSequence) */
+else if (func == "Change") {
+ ret = OUC_configure();
+}
+/* Import configuration */
+else if (func == "Import") {
+ ret = Import(param);
+}
+/* Return actual state */
+else if (func == "Export") {
+ ret = Export();
+}
+/* Return needed packages */
+else if (func == "Packages") {
+ ret = AutoPackages();
+}
+/* Write given settings */
+else if (func == "Write") {
+ import "Progress";
+ Progress::off();
+ ret = Write();
+ Progress::on();
+}
+else if (func == "GetModified") {
+ ret = OnlineUpdateConfiguration::OUCmodified;
+}
+else if (func == "SetModified") {
+ OnlineUpdateConfiguration::OUCmodified = true;
+}
+/* Unknown function */
+else {
+ y2error("Unknown function: %1", func);
+ ret = false;
+}
+
+y2milestone("ret=%1", ret);
+y2milestone("online_update_configuration_auto finished");
+y2milestone("----------------------------------------");
+
+return ret;
+
+/* EOF */
+
+
+}
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.16.7/src/clients/online_update_configuration.ycp new/yast2-registration-2.17.0/src/clients/online_update_configuration.ycp
--- old/yast2-registration-2.16.7/src/clients/online_update_configuration.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-2.17.0/src/clients/online_update_configuration.ycp 2008-09-12 14:56:56.000000000 +0200
@@ -0,0 +1,130 @@
+/**
+ * File: online_update_configuration
+ * Module: Registration
+ * Summary: Configure Online Update
+ * Authors: J. Daniel Schmidt
+ *
+ * Configure Online Update Settings
+ *
+ * $Id: online_update_configuration.ycp 1 2008-09-10 13:20:02Z jdsn $
+ */
+
+{
+ textdomain "registration";
+
+ import "OnlineUpdateConfiguration";
+ import "Wizard";
+ import "Popup";
+ import "Label";
+ import "URL";
+ import "Mode";
+ import "SourceManager";
+ import "PackageCallbacks";
+/* import "FileUtils";
+ import "Package"; */
+
+
+ include "registration/OUCDialogs.ycp";
+
+
+ string help = getOUCHelp(`default);
+ term contents = getOUCDialog(`default);
+
+/* --------------------------------------------------------------------------------------------------------------- */
+
+ // check if we are in installation workflow or running independently
+ if (Mode::normal()) Wizard::CreateDialog();
+
+ // 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();
+
+
+
+ // FIXME: the display of the current and default URL has to be adapted once we can read the data from the products file
+ // this function was missing in libzypp and packagebindings will be available soon, then we can complete this
+
+ if (false) // for testing only
+ {
+ OnlineUpdateConfiguration::currentUpdateRepo = "";
+ }
+
+ string replaceUpdateRepoString = OnlineUpdateConfiguration::currentUpdateRepo;
+
+ if ( OnlineUpdateConfiguration::currentUpdateRepo == OnlineUpdateConfiguration::defaultUpdateRepo &&
+ OnlineUpdateConfiguration::currentUpdateRepo != "" )
+ {// in this case - we have default update repo installed
+ replaceUpdateRepoString = OnlineUpdateConfiguration::currentUpdateRepo + " " + defaultMark;
+ UI::ChangeWidget(`id(`restoreDefault), `Enabled, false);
+ }
+ else
+ { // in this case - custom or no update repo
+ if ( replaceUpdateRepoString == "" ) replaceUpdateRepoString = noRepo;
+ UI::ChangeWidget(`id(`restoreDefault), `Enabled, true);
+ }
+
+ // write data to the UI
+ UI::ChangeWidget(`id(`currentRepoURL), `Value, replaceUpdateRepoString);
+ UI::ChangeWidget(`id(`automaticOnlineUpdate), `Value, OnlineUpdateConfiguration::enableAOU);
+ UI::ChangeWidget(`id(`updateInterval), `Value, OnlineUpdateConfiguration::updateInterval);
+ UI::ChangeWidget(`id(`skipInteractivePatches), `Value, OnlineUpdateConfiguration::skipInteractivePatches);
+
+
+ UI::RecalcLayout();
+ //UI::RedrawScreen();
+
+ any ret=`auto;
+
+ repeat
+ {
+ ret = Wizard::UserInput();
+
+ if (ret == `restoreDefault)
+ {
+ Popup::Message("FIXME: function call to package bindings missing");
+
+ // FIXME: after setting the default update source query it again and update the UI
+ // replaceUpdateRepoString = someQueryCommand();
+
+ UI::ChangeWidget(`id(`currentRepoURL), `Value, replaceUpdateRepoString);
+ UI::RecalcLayout();
+ }
+
+ if (ret == `next)
+ {
+ OnlineUpdateConfiguration::updateInterval = (symbol) UI::QueryWidget(`id(`updateInterval), `Value );
+ OnlineUpdateConfiguration::skipInteractivePatches = (boolean) UI::QueryWidget(`id(`skipInteractivePatches), `Value );
+ OnlineUpdateConfiguration::enableAOU = (boolean) UI::QueryWidget(`id(`automaticOnlineUpdate), `Value );
+
+ OnlineUpdateConfiguration::Write();
+ break;
+ }
+
+ if (ret == `repoManager)
+ {
+ SCR::Execute(.background.run_output, "yast2 inst_source");
+ }
+
+ if (ret == `smolt)
+ {
+ SCR::Execute(.background.run_output, "yast2 smolt");
+ }
+
+ if (ret == `register)
+ {
+ SCR::Execute(.background.run_output, "yast2 inst_suse_register");
+ }
+
+ } until (ret == `next || ret == `abort || ret == `cacel || ret == `back);
+
+ if (! is(ret, symbol)) ret = `next;
+
+ Wizard::CloseDialog();
+ 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.16.7/src/config/automatic_online_update.rnc new/yast2-registration-2.17.0/src/config/automatic_online_update.rnc
--- old/yast2-registration-2.16.7/src/config/automatic_online_update.rnc 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-2.17.0/src/config/automatic_online_update.rnc 2008-09-12 06:14:01.000000000 +0200
@@ -0,0 +1,12 @@
+default namespace = "http://www.suse.com/1.0/yast2ns"
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+namespace config = "http://www.suse.com/1.0/configns"
+
+automatic_online_update = element automatic_online_update { enable_automatic_online_update? & skip_interactive_patches? & update_interval? }
+
+
+enable_automatic_online_update = element enable_automatic_online_update { BOOLEAN }
+skip_interactive_patches = element skip_interactive_patches { 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.16.7/src/config/customer_center.desktop new/yast2-registration-2.17.0/src/config/customer_center.desktop
--- old/yast2-registration-2.16.7/src/config/customer_center.desktop 2008-05-19 16:06:08.000000000 +0200
+++ new/yast2-registration-2.17.0/src/config/customer_center.desktop 2008-09-12 08:50:38.000000000 +0200
@@ -1,11 +1,11 @@
[Desktop Entry]
Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Software;
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Support;
X-SuSE-YaST-Call=inst_suse_register
X-SuSE-YaST-AutoInstClient=suse_register_auto
X-SuSE-YaST-RootOnly=false
-X-SuSE-YaST-Group=Software
+X-SuSE-YaST-Group=Support
X-SuSE-YaST-AutoInst=all
X-SuSE-YaST-AutoInstClonable=true
X-SuSE-YaST-AutoInstRequires=lan,proxy
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.16.7/src/config/Makefile.am new/yast2-registration-2.17.0/src/config/Makefile.am
--- old/yast2-registration-2.16.7/src/config/Makefile.am 2007-08-28 08:04:11.000000000 +0200
+++ new/yast2-registration-2.17.0/src/config/Makefile.am 2008-09-12 09:21:42.000000000 +0200
@@ -1,11 +1,11 @@
# Makefile.am for registration/config
-desktop_DATA = suse_register.desktop customer_center.desktop
+desktop_DATA = suse_register.desktop customer_center.desktop online_update_configuration.desktop
rncdir = $(schemadir)/autoyast/rnc
-rnc_DATA = registration.rnc
+rnc_DATA = registration.rnc automatic_online_update.rnc
-fillup_DATA = sysconfig.suse_register-yast2-registration
+fillup_DATA = sysconfig.suse_register-yast2-registration sysconfig.automatic_online_update-yast2-registration
EXTRA_DIST = $(desktop_DATA) $(rnc_DATA) $(fillup_DATA)
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.16.7/src/config/online_update_configuration.desktop new/yast2-registration-2.17.0/src/config/online_update_configuration.desktop
--- old/yast2-registration-2.16.7/src/config/online_update_configuration.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-2.17.0/src/config/online_update_configuration.desktop 2008-09-12 09:19:05.000000000 +0200
@@ -0,0 +1,18 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Software;
+
+X-SuSE-YaST-Call=online_update_configuration
+X-SuSE-YaST-RootOnly=false
+X-SuSE-YaST-Group=Software
+X-SuSE-YaST-AutoInst=all
+X-SuSE-YaST-AutoInstClonable=true
+X-SuSE-YaST-AutoInstRequires=lan,proxy
+X-SuSE-YaST-AutoInstSchema=automatic_online_update.rnc
+
+Icon=yast-online_update
+Exec=/sbin/yast2 online_update_configuration
+
+Name=Online Update Configuration
+GenericName=Online Update Configuration
+StartupNotify=true
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.16.7/src/config/suse_register.desktop new/yast2-registration-2.17.0/src/config/suse_register.desktop
--- old/yast2-registration-2.16.7/src/config/suse_register.desktop 2008-05-19 16:06:08.000000000 +0200
+++ new/yast2-registration-2.17.0/src/config/suse_register.desktop 2008-09-12 08:51:08.000000000 +0200
@@ -1,10 +1,10 @@
[Desktop Entry]
Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Software;
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Support;
X-SuSE-YaST-Call=inst_suse_register
X-SuSE-YaST-RootOnly=false
-X-SuSE-YaST-Group=Software
+X-SuSE-YaST-Group=Support
X-SuSE-YaST-AutoInst=all
X-SuSE-YaST-AutoInstClonable=true
X-SuSE-YaST-AutoInstRequires=lan,proxy
@@ -13,6 +13,6 @@
Icon=yast-product-registration
Exec=/sbin/yast2 inst_suse_register
-Name=Online Update Configuration
-GenericName=Online Update Configuration
+Name=Support Registration
+GenericName=Support Registration
StartupNotify=true
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.16.7/src/config/sysconfig.automatic_online_update-yast2-registration new/yast2-registration-2.17.0/src/config/sysconfig.automatic_online_update-yast2-registration
--- old/yast2-registration-2.16.7/src/config/sysconfig.automatic_online_update-yast2-registration 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-2.17.0/src/config/sysconfig.automatic_online_update-yast2-registration 2008-09-12 06:06:16.000000000 +0200
@@ -0,0 +1,26 @@
+## Path: System/Yast2/AutomaticOnlineUpdate
+## Description: Automatic Online Update
+
+## Type: boolean
+## Default: "true"
+#
+# This switch can temporarily disable the automatic online
+# update cronjob when set to "false". It will be reset through
+# "yast2 online_update_configuration" if the cronjob for the
+# automatic online update is _not_ removed. On the other hand, if
+# a cronjob file is missing in cron.*ly this switch has no effect.
+#
+#
+AOU_ENABLE_CRONJOB="true"
+
+
+## Type: boolean
+## Default: "true"
+#
+# This will skip interactive patches during an automatic
+# online update run.
+#
+AOU_SKIP_INTERACTIVE_PATCHES="true"
+
+
+
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.16.7/src/dialogs/Makefile.am new/yast2-registration-2.17.0/src/dialogs/Makefile.am
--- old/yast2-registration-2.16.7/src/dialogs/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-2.17.0/src/dialogs/Makefile.am 2008-09-12 07:47:35.000000000 +0200
@@ -0,0 +1,6 @@
+yncludedir = @yncludedir@/registration
+ynclude_DATA = OUCDialogs.ycp
+
+EXTRA_DIST = $(ynclude_DATA)
+
+include $(top_srcdir)/Makefile.am.common
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.16.7/src/dialogs/OUCDialogs.ycp new/yast2-registration-2.17.0/src/dialogs/OUCDialogs.ycp
--- old/yast2-registration-2.16.7/src/dialogs/OUCDialogs.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-2.17.0/src/dialogs/OUCDialogs.ycp 2008-09-12 08:28:49.000000000 +0200
@@ -0,0 +1,128 @@
+/**
+ * File: OUCDialogs.ycp
+ * Module: Registration
+ * Summary: Configure Online Update
+ * Authors: J. Daniel Schmidt
+ *
+ * Configure Online Update Configuration Dialogs
+ *
+ * $Id: OUCDialogs.ycp 1 2008-09-10 13:20:02Z jdsn $
+ */
+
+{
+
+textdomain "registration";
+
+
+// module title
+string moduleTitle = _("Online Update Configuration");
+// translators: (default), meaning: "Current Update Repository: http://xyz/ (default)"
+string defaultMark = _("(default)");
+// translators: (none), meaning "Current Update Repository: (none)"
+string noRepo = _("(none)");
+
+// frame title
+string updateRepository = _("Update Repository");
+// frame title
+string automaticOnlineUpdate = _("Automatic Online Update");
+
+// translators: "Set Default" meaning: Set the Update Repository to the default one
+string setDefaultButtonLabel = _("Set Default");
+// translators: a short button label called "Advanced"
+string advancedMenuButtonLabel = _("Advanced");
+
+string help_title = sformat( "<p><b>%1</b></p>", moduleTitle);
+string help_para1 = sformat(_("<p>In <b>%1</b> the current update repository is shown.</p>"), updateRepository );
+string help_para2 = sformat(_("<p>Press <b>%1</b> to use the default update repository.</p>"), setDefaultButtonLabel );
+string help_para3 = sformat(_("<p>Find related actions in the <b>%1</b> menu.</p>"), advancedMenuButtonLabel );
+string help_para4 = sformat(_("<p>In <b>%1</b> set up the automatic online update. Choose the interval to use and if interactive patches should be ignored, otherwise the updater will use the default answers.</p>"), automaticOnlineUpdate );
+
+
+string editSoftwareRepositories = _("Edit Software Repositories");
+string registerForSupport = _("Register for support and get update repository");
+string sendDataToSmolt = _("Send hardware information to the smolt project");
+string interval = _("Interval");
+string skipInteractivePatches = _("Skip Interactive Patches");
+string currentUpdateRepo = _("Current Update Repository:");
+
+string enabledMsg = _("enabled");
+string disabledMsg = _("disabled");
+
+
+
+string getOUCHelp(symbol type)
+{
+ if (type == `autoyast)
+ {
+ return help_title + help_para1 + help_para2 + help_para3 + help_para4;
+ }
+ else
+ {
+ return help_title + help_para4;
+ }
+ return "";
+}
+
+
+
+
+term getOUCDialog(symbol type)
+{
+
+ list<term> expertMenu = [ `item(`id(`repoManager), editSoftwareRepositories ),
+ `item(`id(`register), registerForSupport )
+ // , `item(`id(`smolt), sendDataToSmolt )
+ ];
+
+ list<term> updateIntervals = [ `item(`id(`daily) , _("daily")) ,
+ `item(`id(`weekly) , _("weekly")) ,
+ `item(`id(`monthly), _("monthly")) ];
+
+ term upRepo = `Frame(updateRepository,
+ `HBox(
+ `HStretch(),
+ `VBox(
+ `Left( `Label( currentUpdateRepo )),
+ `Left( `Label(`id(`currentRepoURL), "" )),
+ `HBox(
+ `PushButton(`id(`restoreDefault), `opt(`disabled), setDefaultButtonLabel),
+ `MenuButton( advancedMenuButtonLabel, expertMenu)
+ )
+ ),
+ `HStretch()
+ )
+ );
+
+ 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()
+ )
+ ));
+
+ term contents = nil;
+
+ if (type == `autoyast)
+ {
+ contents = `VBox( `VSpacing(1.5), autoOnlineUp, `VStretch(), `VSpacing(1.5) );
+ }
+ else
+ {
+ contents = `VBox( `VSpacing(1.5), upRepo,
+ `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.16.7/src/Makefile.am new/yast2-registration-2.17.0/src/Makefile.am
--- old/yast2-registration-2.16.7/src/Makefile.am 2008-04-30 07:34:10.000000000 +0200
+++ new/yast2-registration-2.17.0/src/Makefile.am 2008-09-12 15:05:11.000000000 +0200
@@ -2,4 +2,4 @@
# Makefile.am for installation/src
#
-SUBDIRS = modules clients config control yastbrowser
+SUBDIRS = modules clients config control dialogs yastbrowser scripts
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.16.7/src/modules/Makefile.am new/yast2-registration-2.17.0/src/modules/Makefile.am
--- old/yast2-registration-2.16.7/src/modules/Makefile.am 2008-02-15 15:11:43.000000000 +0100
+++ new/yast2-registration-2.17.0/src/modules/Makefile.am 2008-09-11 15:36:04.000000000 +0200
@@ -2,7 +2,7 @@
# Makefile.am for registration/modules
#
-module_DATA = Register.ycp RegisterCert.pm
+module_DATA = Register.ycp RegisterCert.pm OnlineUpdateConfiguration.ycp
EXTRA_DIST = $(module_DATA)
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.16.7/src/modules/OnlineUpdateConfiguration.ycp new/yast2-registration-2.17.0/src/modules/OnlineUpdateConfiguration.ycp
--- old/yast2-registration-2.16.7/src/modules/OnlineUpdateConfiguration.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-2.17.0/src/modules/OnlineUpdateConfiguration.ycp 2008-09-12 09:37:46.000000000 +0200
@@ -0,0 +1,202 @@
+/**
+ * File: modules/OnlineUpdateConfiguration.ycp
+ * Package: Installation
+ * Summary: Registration related stuff
+ * Authors: J. Daniel Schmidt
+ *
+ * $Id: OnlineUpdateConfiguration.ycp 1 2008-09-10 09:45:05Z jdsn $
+ */
+
+{
+
+module "OnlineUpdateConfiguration";
+
+textdomain "registration";
+
+
+
+global boolean enableAOU = false;
+global boolean skipInteractivePatches = true;
+global symbol updateInterval = `weekly;
+global boolean OUCmodified = false;
+
+
+string onlineUpdateScript = "/usr/lib/YaST2/bin/online_update";
+
+string cronFileName = "opensuse.org-online_update";
+string cronMonthlyFile = "/etc/cron.monthly/" + cronFileName;
+string cronWeeklyFile = "/etc/cron.weekly/" + cronFileName;
+string cronDailyFile = "/etc/cron.daily/" + cronFileName;
+
+global string currentUpdateRepo = "";
+global string defaultUpdateRepo = "";
+
+
+map Intervals = $[ `daily : "daily",
+ `weekly : "weekly",
+ `monthly: "monthly" ];
+
+
+global string intervalSymbolToString(symbol intervalSym)
+{
+ return Intervals[intervalSym]:"none";
+}
+
+global symbol intervalStringToSymbol(string intervalStr)
+{
+ symbol result = `none;
+ foreach(symbol sym, string str, Intervals, {
+ if ( str == intervalStr ) result = sym;
+ return;
+ } );
+ return result;
+}
+
+/*
+ * remove all online update cronjobs
+ *
+ */
+void removeOnlineUpdateCronjobs()
+{
+ SCR::Execute(.target.remove, cronMonthlyFile);
+ SCR::Execute(.target.remove, cronWeeklyFile);
+ SCR::Execute(.target.remove, cronDailyFile);
+}
+
+/*
+ * setup cronjob for an automatic online update
+ * @return true if successful
+ * @para smybol for the interval `daily, `weekly, `monthly
+ */
+global boolean setOnlineUpdateCronjob(symbol interval)
+{
+ string cronSel = "";
+ if (interval == `monthly)
+ cronSel = cronMonthlyFile;
+ else if (interval == `weekly)
+ cronSel = cronWeeklyFile;
+ else if (interval == `daily)
+ cronSel = cronDailyFile;
+
+ removeOnlineUpdateCronjobs();
+
+ if ( (boolean)SCR::Execute(.target.symlink, onlineUpdateScript, cronSel) )
+ {
+ y2milestone("Setting up online update cron job at %1", cronSel);
+ return true;
+ }
+ else
+ {
+ y2milestone("Could not create online update cron job at %1", cronSel);
+ return false;
+ }
+
+ return true;
+}
+
+
+
+
+/*
+ * Read()
+ */
+global void Read()
+{
+ // TODO: read baseproduct and its default update source and registration url
+ // TODO: read current installed update repos -> duncan? -> packagebindings?
+
+ // FIXME: until we can read this information from the products file, we fake it
+ currentUpdateRepo = "http://download.opensuse.org/update/11.1/";
+ defaultUpdateRepo = "http://download.opensuse.org/update/11.1/";
+
+
+ integer interM = (integer) SCR::Read(.target.size, cronMonthlyFile);
+ integer interW = (integer) SCR::Read(.target.size, cronWeeklyFile);
+ integer interD = (integer) SCR::Read(.target.size, cronDailyFile);
+
+ if (interD >= 0)
+ updateInterval = `daily;
+ else if (interW >= 0)
+ updateInterval = `weekly;
+ else if (interM >= 0)
+ updateInterval = `monthly;
+ else
+ updateInterval = `weekly;
+
+ // enableAOU is not read from sysconfig! this is only to deactivate it temporarily
+ // 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;
+
+}
+
+
+/*
+ * Import()
+ */
+global boolean Import(map settings)
+{
+ enableAOU = false;
+ skipInteractivePatches = true;
+ updateInterval = `weekly;
+
+ enableAOU = (boolean) settings["enable_automatic_online_update"]:enableAOU;
+ skipInteractivePatches = (boolean) settings["skip_interactive_patches"]:skipInteractivePatches;
+
+ string getInterval = (string) settings["update_interval"]:"";
+
+ updateInterval = intervalStringToSymbol(getInterval);
+ // fall back to weekly in error case
+ if (updateInterval == `none) updateInterval = `weekly;
+
+ return true;
+}
+
+
+/*
+ * Write()
+ */
+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") );
+
+ if (enableAOU)
+ {
+ y2milestone("Enabling automatic online update with interval: %1", updateInterval);
+ return setOnlineUpdateCronjob(updateInterval);
+ }
+ else
+ {
+ removeOnlineUpdateCronjobs();
+ return true;
+ }
+
+ return true;
+}
+
+
+
+/**
+ * AutoYaST interface function: Export()
+ * @return map with the settings
+ */
+global map Export()
+{
+ if (!enableAOU)
+ {
+ return $[];
+ }
+
+ return $[
+ "enable_automatic_online_update":enableAOU,
+ "skip_interactive_patches":skipInteractivePatches,
+ "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.16.7/src/modules/Register.ycp new/yast2-registration-2.17.0/src/modules/Register.ycp
--- old/yast2-registration-2.16.7/src/modules/Register.ycp 2008-05-27 08:56:54.000000000 +0200
+++ new/yast2-registration-2.17.0/src/modules/Register.ycp 2008-09-04 19:47:11.000000000 +0200
@@ -274,14 +274,21 @@
symbol certmode = nil;
// never ever load a certificate file for a *.novell.com smt server
- if ( regexpmatch(smt_server_parsed["host"]:"", ".+\.novell\.com$")) { certmode = `none; }
- else if (smt_server_cert == nil || smt_server_cert == "") { certmode = `url; }
- else if ( regexpmatch(smt_server_cert, "^(https?|ftp)://.+") ) { certmode = `url; }
- else if ( regexpmatch(smt_server_cert, "^floppy/.+") ) { certmode = `floppy; }
- else if ( regexpmatch(smt_server_cert, "^/.+") ) { certmode = `path; }
- else if ( regexpmatch(smt_server_cert, "^ask$") ) { certmode = `ask; }
- else if ( regexpmatch(smt_server_cert, "^done$") ) { certmode = `done; }
- else { certmode = `none; }
+ if ( regexpmatch(smt_server_parsed["host"]:"", ".+\.novell\.com$"))
+ {
+ y2milestone("Registration detected a *.novell.com domain. For security reasons, there will be no certificate handling in this case.");
+ y2milestone("In order to register against a *.novell.com domain, please make sure your registration server uses a trusted certificate and set regcert=done.");
+ // allow override with regcert="done" (bnc#413231)
+ if (smt_server_cert == "done") { certmode = `done; }
+ else { certmode = `none; }
+ }
+ else if (smt_server_cert == nil || smt_server_cert == "") { certmode = `url; }
+ else if ( regexpmatch(smt_server_cert, "^(https?|ftp)://.+") ) { certmode = `url; }
+ else if ( regexpmatch(smt_server_cert, "^floppy/.+") ) { certmode = `floppy; }
+ else if ( regexpmatch(smt_server_cert, "^/.+") ) { certmode = `path; }
+ else if ( smt_server_cert == "ask" ) { certmode = `ask; }
+ else if ( smt_server_cert == "done" ) { certmode = `done; }
+ else { certmode = `none; }
if (! contains([`none, `done, `url, `floppy, `ask, `path], certmode) )
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.16.7/src/scripts/Makefile.am new/yast2-registration-2.17.0/src/scripts/Makefile.am
--- old/yast2-registration-2.16.7/src/scripts/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-2.17.0/src/scripts/Makefile.am 2008-09-11 16:00:37.000000000 +0200
@@ -0,0 +1,8 @@
+#
+# Makefile.am
+#
+
+ybin_SCRIPTS = online_update
+
+
+EXTRA_DIST = $(ybin_SCRIPTS)
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.16.7/src/scripts/online_update new/yast2-registration-2.17.0/src/scripts/online_update
--- old/yast2-registration-2.16.7/src/scripts/online_update 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-2.17.0/src/scripts/online_update 2008-09-11 16:56:26.000000000 +0200
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+zyppercmd="/usr/bin/zypper"
+upcmd="/bin/false"
+syscfgfile="/etc/sysconfig/automatic_online_update"
+skipInteractive="--skip-interactive"
+
+if [ -x ${zyppercmd} ]
+then
+ upcmd=${zyppercmd}
+else
+ echo "zypper is not installed. Can not run online update."
+ exit 1
+fi
+
+
+if [ -f ${syscfgfile} ]
+then
+ . ${syscfgfile}
+fi
+
+
+if [ ! -z $AOU_ENABLE_CRONJOB ]
+then
+ if [ ! $AOU_ENABLE_CRONJOB = "true" ]
+ then
+ echo "Online Update is disabled in ${syscfgfile}. Will not run update."
+ exit 0
+ fi
+fi
+
+
+
+if [ ! -z ${AOU_SKIP_INTERACTIVE_PATCHES} ]
+then
+ if [ ${AOU_SKIP_INTERACTIVE_PATCHES} = "true" ]
+ then
+ skipInteractive="--skip-interactive"
+ else
+ skipInteractive=
+ fi
+fi
+
+
+# run the update
+${upcmd} --quiet up -y -t patch ${skipInteractive}
+
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.16.7/VERSION new/yast2-registration-2.17.0/VERSION
--- old/yast2-registration-2.16.7/VERSION 2008-05-30 08:03:54.000000000 +0200
+++ new/yast2-registration-2.17.0/VERSION 2008-09-12 15:01:18.000000000 +0200
@@ -1 +1 @@
-2.16.7
+2.17.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org