Author: jdsn Date: Thu Sep 24 19:09:03 2009 New Revision: 58758 URL: http://svn.opensuse.org/viewcvs/yast?rev=58758&view=rev Log: disable update repo restore because of bnc#449842 update cronjob support for auto license agreement (bnc#474573) 2.18.0 Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes trunk/registration/src/clients/online_update_configuration.ycp trunk/registration/src/clients/online_update_configuration_auto.ycp trunk/registration/src/config/online_update_configuration.rnc trunk/registration/src/config/sysconfig.automatic_online_update-yast2-registration trunk/registration/src/dialogs/OUCDialogs.ycp trunk/registration/src/modules/OnlineUpdateConfiguration.ycp trunk/registration/src/scripts/online_update Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=58758&r1=58757&r2=58758&view=diff ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Thu Sep 24 19:09:03 2009 @@ -1 +1 @@ -2.17.17 +2.18.0 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-registration.changes?rev=58758&r1=58757&r2=58758&view=diff ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Thu Sep 24 19:09:03 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +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 Modified: trunk/registration/src/clients/online_update_configuration.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/online_update_configuration.ycp?rev=58758&r1=58757&r2=58758&view=diff ============================================================================== --- trunk/registration/src/clients/online_update_configuration.ycp (original) +++ trunk/registration/src/clients/online_update_configuration.ycp Thu Sep 24 19:09:03 2009 @@ -92,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(); @@ -107,6 +108,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 ); y2milestone("Writing online update configuration settings."); Modified: trunk/registration/src/clients/online_update_configuration_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/online_update_configuration_auto.ycp?rev=58758&r1=58757&r2=58758&view=diff ============================================================================== --- trunk/registration/src/clients/online_update_configuration_auto.ycp (original) +++ trunk/registration/src/clients/online_update_configuration_auto.ycp Thu Sep 24 19:09:03 2009 @@ -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; } Modified: trunk/registration/src/config/online_update_configuration.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/config/online_update_configuration.rnc?rev=58758&r1=58757&r2=58758&view=diff ============================================================================== --- trunk/registration/src/config/online_update_configuration.rnc (original) +++ trunk/registration/src/config/online_update_configuration.rnc Thu Sep 24 19:09:03 2009 @@ -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 } Modified: trunk/registration/src/config/sysconfig.automatic_online_update-yast2-registration URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/config/sysconfig.automatic_online_update-yast2-registration?rev=58758&r1=58757&r2=58758&view=diff ============================================================================== --- trunk/registration/src/config/sysconfig.automatic_online_update-yast2-registration (original) +++ trunk/registration/src/config/sysconfig.automatic_online_update-yast2-registration Thu Sep 24 19:09:03 2009 @@ -23,4 +23,9 @@ AOU_SKIP_INTERACTIVE_PATCHES="true" - +## Type: boolean +## Default: "false" +# +# Automatically agree with licenses. +# +AOU_AUTO_AGREE_WITH_LICENSES="false" Modified: trunk/registration/src/dialogs/OUCDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/dialogs/OUCDialogs.ycp?rev=58758&r1=58757&r2=58758&view=diff ============================================================================== --- trunk/registration/src/dialogs/OUCDialogs.ycp (original) +++ trunk/registration/src/dialogs/OUCDialogs.ycp Thu Sep 24 19:09:03 2009 @@ -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; Modified: trunk/registration/src/modules/OnlineUpdateConfiguration.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/OnlineUpdateConfiguration.ycp?rev=58758&r1=58757&r2=58758&view=diff ============================================================================== --- trunk/registration/src/modules/OnlineUpdateConfiguration.ycp (original) +++ trunk/registration/src/modules/OnlineUpdateConfiguration.ycp Thu Sep 24 19:09:03 2009 @@ -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) ]; } Modified: trunk/registration/src/scripts/online_update URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/scripts/online_update?rev=58758&r1=58757&r2=58758&view=diff ============================================================================== --- trunk/registration/src/scripts/online_update (original) +++ trunk/registration/src/scripts/online_update Thu Sep 24 19:09:03 2009 @@ -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} -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org