Author: jsuchome Date: Tue Jun 19 09:07:14 2007 New Revision: 38516 URL: http://svn.opensuse.org/viewcvs/yast?rev=38516&view=rev Log: - Automatic Online Update: remove option for "only downloading" patches (missing support in zypper, F302159) - 2.15.17 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/AutoOnlineUpdate.ycp trunk/online-update/src/OnlineUpdateDialogs.ycp trunk/online-update/yast2-online-update.spec.in Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=38516&r1=38515&r2=38516&view=diff ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Tue Jun 19 09:07:14 2007 @@ -1 +1 @@ -2.15.16 +2.15.17 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-online-update.changes?rev=38516&r1=38515&r2=38516&view=diff ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Tue Jun 19 09:07:14 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jun 18 14:57:58 CEST 2007 - jsuchome@suse.cz + +- Automatic Online Update: remove option for "only downloading" + patches (missing support in zypper, F302159) +- 2.15.17 + +------------------------------------------------------------------- Tue Jun 5 09:08:58 CEST 2007 - jsuchome@suse.cz - when the package selector is skipped, check if there are not Modified: trunk/online-update/src/AutoOnlineUpdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/AutoOnlineUpdate.ycp?rev=38516&r1=38515&r2=38516&view=diff ============================================================================== --- trunk/online-update/src/AutoOnlineUpdate.ycp (original) +++ trunk/online-update/src/AutoOnlineUpdate.ycp Tue Jun 19 09:07:14 2007 @@ -198,7 +198,7 @@ cronjob = sformat ("%1 %2 * * * root %3 up -y -t patch %4", minute, hour, updater, options); } - if ( autoget ) cronjob = cronjob + " -d"; +// if ( autoget ) cronjob = cronjob + " -d"; if ( skipPre ) cronjob = cronjob + " --skip-interactive"; cronjob = cronjob + "\n"; SCR::Write( .target.string, cronfile, cronjob ); @@ -266,7 +266,7 @@ update_time["random_time"] = random_time; update_time["timing"] = (timing == `weekly)? "weekly":"daily"; settings["update_time"] = update_time; - settings["autoget"] = autoget; +// settings["autoget"] = autoget; settings["skipPre"] = skipPre; settings["enable_autoupdate"] = enabled; @@ -283,6 +283,7 @@ string summary = ""; string nc = Summary::NotConfigured (); + // summary header (yes/no follows) summary = Summary::AddHeader(summary, _("Scheduled Online Update Enabled")); summary = Summary::AddLine(summary, enabled ? _("Yes") : _("No") ); @@ -306,12 +307,17 @@ timestr = sformat(_("%1 at a Random Time"), when); } + // summary header summary = Summary::AddHeader(summary, _("Time of Scheduled Online Update")); summary = Summary::AddLine(summary, ( (hour!=-1 && minute!= -1 && enabled) || random_time ) ? timestr : nc ); + /* + // summary header summary = Summary::AddHeader(summary, _("Only Download Patches")); summary = Summary::AddLine(summary, autoget ? _("Yes") : _("No") ); + */ + // summary header summary = Summary::AddHeader(summary, _("Skip packages with preinstall information?")); summary = Summary::AddLine(summary, skipPre ? _("Yes") : _("No") ); Modified: trunk/online-update/src/OnlineUpdateDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/OnlineUpdateDialogs.ycp?rev=38516&r1=38515&r2=38516&view=diff ============================================================================== --- trunk/online-update/src/OnlineUpdateDialogs.ycp (original) +++ trunk/online-update/src/OnlineUpdateDialogs.ycp Tue Jun 19 09:07:14 2007 @@ -123,6 +123,7 @@ )), `VSpacing( 0.2 ), `VBox( + /* `HBox( `HSpacing( 0.8 ), `Left(`CheckBox( `id( `autoget ), @@ -131,6 +132,7 @@ ), `HSpacing( 0.8 ) ), + */ `HBox( `HSpacing( 0.8 ), `Left (`CheckBox( `id( `skipPre), @@ -162,7 +164,7 @@ Label::BackButton(), Label::FinishButton()); - UI::ChangeWidget( `id( `autoget ), `Enabled, enabled ); +// UI::ChangeWidget( `id( `autoget ), `Enabled, enabled ); UI::ChangeWidget( `id( `skipPre ), `Enabled, enabled ); UI::ChangeWidget( `id( `timing ), `Enabled, enabled ); UI::ChangeWidget( `id( `day ), `Enabled, enabled ); @@ -182,7 +184,7 @@ if ( ret == `enable ) { - UI::ChangeWidget( `id( `autoget ), `Enabled, enabled ); +// UI::ChangeWidget( `id( `autoget ), `Enabled, enabled ); UI::ChangeWidget( `id( `skipPre ), `Enabled, enabled ); UI::ChangeWidget( `id( `crontime ), `Enabled, enabled ); UI::ChangeWidget( `id( `timing ), `Enabled, enabled ); @@ -229,7 +231,7 @@ } AutoOnlineUpdate::minute = (integer)UI::QueryWidget( `id( `minute ), `Value ); AutoOnlineUpdate::hour = (integer)UI::QueryWidget( `id( `hour ), `Value ); - AutoOnlineUpdate::autoget = (boolean)UI::QueryWidget( `id( `autoget ), `Value ); +// AutoOnlineUpdate::autoget = (boolean)UI::QueryWidget( `id( `autoget ), `Value ); AutoOnlineUpdate::skipPre = (boolean)UI::QueryWidget( `id( `skipPre ), `Value ); AutoOnlineUpdate::day = (integer)UI::QueryWidget( `id(`day ), `Value ); AutoOnlineUpdate::timing = (symbol)UI::QueryWidget(`id(`timing), `CurrentButton ); Modified: trunk/online-update/yast2-online-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/yast2-online-update.spec.in?rev=38516&r1=38515&r2=38516&view=diff ============================================================================== --- trunk/online-update/yast2-online-update.spec.in (original) +++ trunk/online-update/yast2-online-update.spec.in Tue Jun 19 09:07:14 2007 @@ -49,8 +49,10 @@ rm -f /etc/cron.d/yast2-online-update.bak # now we have zypper instead of rug (bug #273133) if [ "`grep -c rug /etc/cron.d/yast2-online-update 2>/dev/null`" -gt 0 ]; then - sed -e "s/rug/zypper/g" -i /etc/cron.d/yast2-online-update + sed -e "s/rug/zypper/g" -i /etc/cron.d/yast2-online-update fi + # -d is not supported in 10.3 + sed -e "s/ -d//" -i /etc/cron.d/yast2-online-update fi to_remove="/usr/share/YaST2/clients/product_post.ycp" if [ -f $to_remove ] ; then -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org