Hello community, here is the log from the commit of package yast2-online-update checked in at Wed Apr 19 16:15:44 CEST 2006. -------- --- yast2-online-update/yast2-online-update.changes 2006-04-18 15:24:06.000000000 +0200 +++ NOARCH/yast2-online-update/yast2-online-update.changes 2006-04-19 14:23:42.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 19 14:07:56 CEST 2006 - jsuchome@suse.cz + +- create temporary CD source for 'Patch CD Update' +- 2.13.27 + +------------------------------------------------------------------- Old: ---- yast2-online-update-2.13.26.tar.bz2 New: ---- yast2-online-update-2.13.27.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-online-update.spec ++++++ --- /var/tmp/diff_new_pack.IczPDE/_old 2006-04-19 16:15:08.000000000 +0200 +++ /var/tmp/diff_new_pack.IczPDE/_new 2006-04-19 16:15:08.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-online-update (Version 2.13.26) +# spec file for package yast2-online-update (Version 2.13.27) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-online-update -Version: 2.13.26 +Version: 2.13.27 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-online-update-2.13.26.tar.bz2 +Source0: yast2-online-update-2.13.27.tar.bz2 prefix: /usr BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer pkg-config update-desktop-files yast2-bootloader yast2-devtools yast2-packager PreReq: grep sed @@ -45,7 +45,7 @@ gs@suse.de %prep -%setup -n yast2-online-update-2.13.26 +%setup -n yast2-online-update-2.13.27 %build %{prefix}/bin/y2tool y2autoconf @@ -114,6 +114,9 @@ %{prefix}/share/applications/YaST2/cd_update.desktop %changelog -n yast2-online-update +* Wed Apr 19 2006 - jsuchome@suse.cz +- create temporary CD source for 'Patch CD Update' +- 2.13.27 * Tue Apr 18 2006 - jsuchome@suse.cz - return negative value when yast should be restarted so ncurses menu can exit ++++++ yast2-online-update-2.13.26.tar.bz2 -> yast2-online-update-2.13.27.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.13.26/VERSION new/yast2-online-update-2.13.27/VERSION --- old/yast2-online-update-2.13.26/VERSION 2006-04-18 15:12:38.000000000 +0200 +++ new/yast2-online-update-2.13.27/VERSION 2006-04-19 14:08:19.000000000 +0200 @@ -1 +1 @@ -2.13.26 +2.13.27 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.13.26/src/OnlineUpdate.ycp new/yast2-online-update-2.13.27/src/OnlineUpdate.ycp --- old/yast2-online-update-2.13.26/src/OnlineUpdate.ycp 2006-04-18 14:06:19.000000000 +0200 +++ new/yast2-online-update-2.13.27/src/OnlineUpdate.ycp 2006-04-19 14:05:04.000000000 +0200 @@ -15,17 +15,15 @@ */ global boolean cd_update = false; +// no. of temporary source +global integer cd_source = -1; + /** * flag: YOU automatic get mode? */ global boolean you_auto_get = false; /** - * flag: YOU automatic install mode? - */ -global boolean you_auto_install = false; - -/** * flag: Automatic Update */ global boolean you_auto = false; @@ -36,16 +34,6 @@ global boolean you_continue = false; /** - * batch kind like security,..... - */ -global string you_auto_batchkind = "all"; - -/** - * flag: YOU ok? - */ -global boolean you_ok = true; - -/** * reloading serverlist form www.suse.de */ global string reloadServer = "yes"; @@ -56,11 +44,6 @@ global string you_url = ""; /** - * should signatures be checked? - */ -global boolean signature_check = true; - -/** Force reload of all patches? */ global boolean reload = true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.13.26/src/online_update.ycp new/yast2-online-update-2.13.27/src/online_update.ycp --- old/yast2-online-update-2.13.26/src/online_update.ycp 2006-04-18 14:07:01.000000000 +0200 +++ new/yast2-online-update-2.13.27/src/online_update.ycp 2006-04-19 14:06:57.000000000 +0200 @@ -69,53 +69,17 @@ OnlineUpdate::you_auto_get = true; OnlineUpdate::you_auto = true; } - else if ( arg == .auto.install || arg == ".auto.install" ) - { - OnlineUpdate::you_auto_install = true; - OnlineUpdate::you_auto = true; - } - else if ( arg == .nosigcheck || arg == ".nosigcheck" ) - { - OnlineUpdate::signature_check = false; - } - else if ( arg == .url || arg == ".url" ) - { - if ( arg_n + 1 < arg_max ) { - OnlineUpdate::you_url = (string)WFM::Args( arg_n + 1 ); - } - arg_n = arg_n + 1; - } - else - { - // batch kind like security,..... - OnlineUpdate::you_auto_batchkind = sformat("%1", WFM::Args(arg_n) ); - y2milestone( "Getting patches for kind %1 only", WFM::Args(arg_n) ); - } - arg_n = arg_n + 1; } - // FIXME - use rug for this... if ( OnlineUpdate::you_auto ) { - string command = "online_update"; - if ( size( OnlineUpdate::you_url ) != 0 ) { - command = command + " -u " + OnlineUpdate::you_url; - } - if ( !OnlineUpdate::signature_check ) { - command = command + " -n"; - } + y2warning ("This usage of online_update.ycp is OBSOLETE, use rug instead"); + string command = "rug up -t patch"; if ( OnlineUpdate::you_auto_get ) { - command = command + " -g"; - } - if ( OnlineUpdate::you_auto_install ) { - command = command + " -i"; + command = command + " -d"; } - command = command + " " + OnlineUpdate::you_auto_batchkind; - - y2debug( "COMMAND: %1", command ); - + y2milestone ("command: %1", command ); integer result = (integer)SCR::Execute( .target.bash, command ); - return result; } @@ -135,7 +99,7 @@ // initialize target to import all trusted keys (#165849) Pkg::TargetInit( "/", false ); - + OnlineUpdateCallbacks::RefreshAllSources(); OnlineUpdateCallbacks::RegisterOnlineUpdateCallbacks(); @@ -145,7 +109,6 @@ */ list dialog = [ -// [ "online_update_start", [ false, true ], `always ], TODO do we need any "configuration" here, when the sources were already configured? [ "online_update_select", [ false, true ], `manual ], [ "online_update_install", [ false, true ], `always ], [ "inst_suseconfig", [GetInstArgs::Buttons(false,false) ], `always ] @@ -203,6 +166,11 @@ UI::CloseDialog(); + if (OnlineUpdate::cd_update && OnlineUpdate::cd_source > -1) + { + Pkg::SourceDelete (OnlineUpdate::cd_source); + } + if (OnlineUpdate::restart_yast) { OnlineUpdate::restart_yast = false; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.13.26/src/online_update_select.ycp new/yast2-online-update-2.13.27/src/online_update_select.ycp --- old/yast2-online-update-2.13.26/src/online_update_select.ycp 2006-04-18 14:39:19.000000000 +0200 +++ new/yast2-online-update-2.13.27/src/online_update_select.ycp 2006-04-19 14:07:52.000000000 +0200 @@ -17,6 +17,15 @@ Pkg::SourceStartManager (true); // target already initialized in online_update.ycp + if (OnlineUpdate::cd_update) + { + string initMessage = _("Initializing for CD update..."); + UI::OpenDialog(`opt(`decorated ),`Label( initMessage )); + OnlineUpdate::cd_source = Pkg::SourceCreate ("cd:///", ""); + UI::CloseDialog(); + } + + Pkg::PkgEstablish(); integer selected = 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...