Hello community, here is the log from the commit of package yast2-online-update checked in at Fri Mar 31 16:01:13 CEST 2006. -------- --- yast2-online-update/yast2-online-update.changes 2006-03-28 09:54:28.000000000 +0200 +++ yast2-online-update/yast2-online-update.changes 2006-03-31 15:35:31.000000000 +0200 @@ -1,0 +2,29 @@ +Fri Mar 31 15:13:51 CEST 2006 - jsuchome@suse.cz + +- online_update_install: full progress when no patch was installed, + do not change button labels during installation +- 2.13.18 + +------------------------------------------------------------------- +Thu Mar 30 15:10:12 CEST 2006 - mvidner@suse.cz + +- inst_you: Do not call Pkg::Init, inst_suse_register did it + already; get package list only after zypp comes back up. +- Don't run the module if another process has the zypp lock (#160319). +- 2.13.17 + +------------------------------------------------------------------- +Wed Mar 29 17:19:51 CEST 2006 - visnov@suse.cz + +- fix patch message callback +- call PkgEstablish and preselect patches before + starting patch selector +- 2.13.16 + +------------------------------------------------------------------- +Wed Mar 29 09:17:34 CEST 2006 - jsuchome@suse.cz + +- do not check user input in DoneProvide and DonePackage callbacks + (#160966) + +------------------------------------------------------------------- Old: ---- yast2-online-update-2.13.15.tar.bz2 New: ---- yast2-online-update-2.13.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-online-update.spec ++++++ --- /var/tmp/diff_new_pack.O4a24H/_old 2006-03-31 16:00:40.000000000 +0200 +++ /var/tmp/diff_new_pack.O4a24H/_new 2006-03-31 16:00:40.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-online-update (Version 2.13.15) +# spec file for package yast2-online-update (Version 2.13.18) # # 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.15 -Release: 2 +Version: 2.13.18 +Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-online-update-2.13.15.tar.bz2 +Source0: yast2-online-update-2.13.18.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.15 +%setup -n yast2-online-update-2.13.18 %build %{prefix}/bin/y2tool y2autoconf @@ -114,6 +114,23 @@ %{prefix}/share/applications/YaST2/cd_update.desktop %changelog -n yast2-online-update +* Fri Mar 31 2006 - jsuchome@suse.cz +- online_update_install: full progress when no patch was installed, + do not change button labels during installation +- 2.13.18 +* Thu Mar 30 2006 - mvidner@suse.cz +- inst_you: Do not call Pkg::Init, inst_suse_register did it + already; get package list only after zypp comes back up. +- Don't run the module if another process has the zypp lock (#160319). +- 2.13.17 +* Wed Mar 29 2006 - visnov@suse.cz +- fix patch message callback +- call PkgEstablish and preselect patches before + starting patch selector +- 2.13.16 +* Wed Mar 29 2006 - jsuchome@suse.cz +- do not check user input in DoneProvide and DonePackage callbacks + (#160966) * Tue Mar 28 2006 - locilka@suse.cz - Refreshing all sources (with autorefresh enabled) before the online is started (#154990). ++++++ yast2-online-update-2.13.15.tar.bz2 -> yast2-online-update-2.13.18.tar.bz2 ++++++ ++++ 17873 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-online-update-2.13.15/Makefile.am new/yast2-online-update-2.13.18/Makefile.am --- old/yast2-online-update-2.13.15/Makefile.am 2006-03-28 10:08:15.000000000 +0200 +++ new/yast2-online-update-2.13.18/Makefile.am 2006-03-20 15:06:41.000000000 +0100 @@ -154,7 +154,7 @@ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-all-packages package-local TAGVERSION = $(PREFIX)/bin/y2tool tagversion @@ -199,9 +199,6 @@ false; \ fi -check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) - stable: checkin-stable checkin-stable: package 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-online-update-2.13.15/VERSION new/yast2-online-update-2.13.18/VERSION --- old/yast2-online-update-2.13.15/VERSION 2006-03-28 09:52:57.000000000 +0200 +++ new/yast2-online-update-2.13.18/VERSION 2006-03-31 15:14:58.000000000 +0200 @@ -1 +1 @@ -2.13.15 +2.13.18 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-online-update-2.13.15/configure.in new/yast2-online-update-2.13.18/configure.in --- old/yast2-online-update-2.13.15/configure.in 2006-03-28 10:08:14.000000000 +0200 +++ new/yast2-online-update-2.13.18/configure.in 2006-03-20 15:06:41.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-online-update, 2.13.15, http://www.suse.de/feedback, yast2-online-update) +AC_INIT(yast2-online-update, 2.13.8, http://www.suse.de/feedback, yast2-online-update) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.15" +VERSION="2.13.8" RPMNAME="yast2-online-update" MAINTAINER="Michael Radziej <mir@suse.de>" 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-online-update-2.13.15/src/OnlineUpdateCallbacks.ycp new/yast2-online-update-2.13.18/src/OnlineUpdateCallbacks.ycp --- old/yast2-online-update-2.13.15/src/OnlineUpdateCallbacks.ycp 2006-03-28 09:50:31.000000000 +0200 +++ new/yast2-online-update-2.13.18/src/OnlineUpdateCallbacks.ycp 2006-03-31 08:53:38.000000000 +0200 @@ -83,23 +83,18 @@ return ""; } - global define string MessageCallback( string type, list<map> patches ) - ``{ -// y2internal( "MessageCallback %1", type ); - - if ( type == "preinfo" ) { - boolean install = OnlineUpdateDialogs::MessagePopup( patches, true ); - if ( install ) return ""; - else return "skip"; - } else if ( type == "postinfo" ) { - OnlineUpdateDialogs::MessagePopup( patches, false ); - return ""; - } else { - y2error( "Wrong message type: %1", type ); - return "error"; - } + global void MessageCallback( string patchname, string patchsummary, string message ) + { + // handle all messages as post (OK only) + list<map> patches = [ + $[ + "name" : patchname, + "summary" : patchsummary, + "postinformation": message, + ] + ]; - return ""; + OnlineUpdateDialogs::MessagePopup( patches, false ); } global define void LogCallback( string text ) @@ -181,8 +176,9 @@ { FinishLine (); total_progress = total_progress + 1; - if (!ProgressCallback (total_progress)) - ret = (ErrorCallback ("abort", "", "") == "abort") ? "C" : ""; + if ( UI::WidgetExists( `id( `progress ) ) ) { + UI::ChangeWidget( `id( `progress ), `Value, total_progress); + } } return ret; } @@ -200,8 +196,9 @@ { FinishLine (); total_progress = total_progress + 1; - if (!ProgressCallback (total_progress)) - ret = (ErrorCallback ("abort", "", "") == "abort") ? "C" : ""; + if ( UI::WidgetExists( `id( `progress ) ) ) { + UI::ChangeWidget( `id( `progress ), `Value, total_progress); + } } return ret; } @@ -213,10 +210,6 @@ ``{ y2milestone ( "OnlineUpdateCallbacks constructor" ); - Pkg::CallbackYouProgress ("OnlineUpdateCallbacks::ProgressCallback"); - Pkg::CallbackYouPatchProgress ("OnlineUpdateCallbacks::PatchProgressCallback"); - Pkg::CallbackYouError ("OnlineUpdateCallbacks::ErrorCallback"); - Pkg::CallbackStartProvide( "OnlineUpdateCallbacks::StartProvide" ); Pkg::CallbackProgressProvide( "OnlineUpdateCallbacks::PatchProgressCallback" ); Pkg::CallbackDoneProvide( "OnlineUpdateCallbacks::DoneProvide" ); @@ -225,7 +218,11 @@ Pkg::CallbackProgressPackage ("OnlineUpdateCallbacks::PatchProgressCallback"); Pkg::CallbackDonePackage( "OnlineUpdateCallbacks::DonePackage" ); - Pkg::CallbackYouMessage ("OnlineUpdateCallbacks::MessageCallback"); + Pkg::CallbackResolvableReport ("OnlineUpdateCallbacks::MessageCallback"); + + Pkg::CallbackYouProgress ("OnlineUpdateCallbacks::ProgressCallback"); + Pkg::CallbackYouPatchProgress ("OnlineUpdateCallbacks::PatchProgressCallback"); + Pkg::CallbackYouError ("OnlineUpdateCallbacks::ErrorCallback"); Pkg::CallbackYouLog ("OnlineUpdateCallbacks::LogCallback"); Pkg::CallbackYouExecuteYcpScript ("OnlineUpdateCallbacks::ExecuteYcpScriptCallback"); Pkg::CallbackYouScriptProgress ("OnlineUpdateCallbacks::ScriptProgressCallback"); 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-online-update-2.13.15/src/OnlineUpdateDialogs.ycp new/yast2-online-update-2.13.18/src/OnlineUpdateDialogs.ycp --- old/yast2-online-update-2.13.15/src/OnlineUpdateDialogs.ycp 2006-03-21 15:32:24.000000000 +0100 +++ new/yast2-online-update-2.13.18/src/OnlineUpdateDialogs.ycp 2006-03-31 08:53:38.000000000 +0200 @@ -502,19 +502,22 @@ message = message + header; message = message + "<pre>" + info + "</pre>"; - - details = details + header; - + list<string> packages = patch[ "packages" ]:[]; - details = details + _("<b>Packages:</b>"); + if( size( packages ) > 0 ) + { + details = details + header; - details = details + "<ul>"; + details = details + _("<b>Packages:</b>"); - foreach( string p, packages, ``{ details = details + "<li>" + p + "</li>"; } ); + details = details + "<ul>"; - details = details + "</ul>"; + foreach( string p, packages, ``{ details = details + "<li>" + p + "</li>"; } ); + details = details + "</ul>"; + } + i = i + 1; } @@ -532,13 +535,13 @@ term buttons = nil; if ( pre ) { buttons = `HBox( - detailsButton, + details == "" ? `Empty : detailsButton, `PushButton( `id( `ok ), _("Install Patch") ), `PushButton( `id( `skip ), _("Skip Patch") ) ); } else { buttons = `HBox( - detailsButton, + details == "" ? `Empty : detailsButton, `PushButton( `id( `ok ), Label::OKButton() ) ); } 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-online-update-2.13.15/src/inst_you.ycp new/yast2-online-update-2.13.18/src/inst_you.ycp --- old/yast2-online-update-2.13.15/src/inst_you.ycp 2006-03-27 09:36:02.000000000 +0200 +++ new/yast2-online-update-2.13.18/src/inst_you.ycp 2006-03-31 08:53:38.000000000 +0200 @@ -101,6 +101,14 @@ symbol ret = `auto; + // initalize package callbacks + PackageCallbacksInit::InitPackageCallbacks(); + + WaitForSources (); + // restore after inst_suse_register shut zypp down by Pkg::Init + Pkg::SourceStartManager(true); + Pkg::TargetInit ("/", false); + // do snapshot of YaST and kernel packages list<string> packages = Pkg::GetPackages (`installed, false); list<string> kernel_packages = filter (string p, packages, { @@ -112,21 +120,6 @@ y2milestone ("Kernel packages before YOU: %1", kernel_packages); y2milestone ("YaST packages before YOU: %1", yast2_packages); - // Pkg::Init cannot be called by inst_suse_register because the - // user could go Back Back Back and try funky stuff without zypp - // being awake - - // reinitalize ZYpp while rug is adding the source for us - Pkg::Init (); - - // initalize package callbacks - PackageCallbacksInit::InitPackageCallbacks(); - - WaitForSources (); - // restore - Pkg::SourceStartManager(true); - Pkg::TargetInit ("/", false); - // compute ResStatus::EstablishField Pkg::PkgEstablish (); // select all Needed patches for installation 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-online-update-2.13.15/src/online_update.ycp new/yast2-online-update-2.13.18/src/online_update.ycp --- old/yast2-online-update-2.13.15/src/online_update.ycp 2006-03-28 09:45:30.000000000 +0200 +++ new/yast2-online-update-2.13.18/src/online_update.ycp 2006-03-31 08:53:38.000000000 +0200 @@ -9,11 +9,13 @@ textdomain "online-update"; + import "Confirm"; import "Directory"; import "Label"; import "Mode"; import "OnlineUpdate"; import "OnlineUpdateCallbacks"; + import "PackageLock"; import "Version"; import "Wizard"; import "GetInstArgs"; @@ -124,6 +126,15 @@ Wizard::CreateDialog(); Wizard::SetDesktopIcon("online_update"); + + // check whether running as root + // and having the packager for ourselves + if (! Confirm::MustBeRoot () || ! PackageLock::Check ()) + { + UI::CloseDialog (); + return 1; + } + OnlineUpdateCallbacks::RefreshAllSources(); OnlineUpdateCallbacks::RegisterOnlineUpdateCallbacks(); 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-online-update-2.13.15/src/online_update_install.ycp new/yast2-online-update-2.13.18/src/online_update_install.ycp --- old/yast2-online-update-2.13.15/src/online_update_install.ycp 2006-03-28 08:32:11.000000000 +0200 +++ new/yast2-online-update-2.13.18/src/online_update_install.ycp 2006-03-31 14:40:38.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: YOU installation page * Authors: Cornelius Schumacher <cschum@suse.de> * - * $Id: online_update_install.ycp 29441 2006-03-27 15:55:14Z jsuchome $ + * $Id: online_update_install.ycp 29582 2006-03-31 12:40:35Z jsuchome $ * * This is a client for autoinstallation. * It displays the dialog for the actual installation, @@ -19,6 +19,7 @@ import "Label"; import "OnlineUpdate"; import "Popup"; + import "Stage"; import "Wizard"; import "OnlineUpdateDialogs"; @@ -78,12 +79,15 @@ help_text, true, true ); - Wizard::SetNextButton(`next, Label::FinishButton() ); + if (!Stage::cont ()) + Wizard::SetNextButton(`next, Label::FinishButton() ); Wizard::DisableBackButton(); Wizard::DisableNextButton(); Pkg::PkgSolve (true); integer total_progress = size (Pkg::GetPackages (`selected, true)) * 2; + if (total_progress == 0) + total_progress = 100; UI::ReplaceWidget (`id(`rpprogress), `ProgressBar( `id( `progress ), _("Total Progress"), total_progress) @@ -108,7 +112,8 @@ if ( !installedPackages ) { Wizard::DisableAbortButton(); - Wizard::SetNextButton(`next, Label::CloseButton() ); + if (!Stage::cont ()) + Wizard::SetNextButton(`next, Label::CloseButton() ); UI::ChangeWidget( `id( `patchprogress ), `Value, 100 ); UI::ChangeWidget( `id( `progress ), `Value, total_progress); } 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-online-update-2.13.15/src/online_update_select.ycp new/yast2-online-update-2.13.18/src/online_update_select.ycp --- old/yast2-online-update-2.13.15/src/online_update_select.ycp 2006-03-28 09:14:48.000000000 +0200 +++ new/yast2-online-update-2.13.18/src/online_update_select.ycp 2006-03-31 08:53:38.000000000 +0200 @@ -14,6 +14,10 @@ Pkg::SourceStartManager (true); Pkg::TargetInit ("/",false); + Pkg::PkgEstablish(); + + Pkg::ResolvablePreselectPatches(); + UI::OpenDialog(`opt(`defaultsize), `PackageSelector(`id(`selector), `opt(`youMode)) ); symbol ret = (symbol)UI::RunPkgSelection(`id(`selector) ); UI::CloseDialog(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de