Hello community,
here is the log from the commit of package yast2-online-update
checked in at Wed Mar 29 18:00:07 CEST 2006.
--------
--- yast2-online-update/yast2-online-update.changes 2006-03-29 17:28:01.000000000 +0200
+++ yast2-online-update/yast2-online-update.changes 2006-03-28 09:54:28.000000000 +0200
@@ -2,14 +1,0 @@
-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.16.tar.bz2
New:
----
yast2-online-update-2.13.15.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-online-update.spec ++++++
--- /var/tmp/diff_new_pack.NAQMm8/_old 2006-03-29 17:59:50.000000000 +0200
+++ /var/tmp/diff_new_pack.NAQMm8/_new 2006-03-29 17:59:50.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-online-update (Version 2.13.16)
+# spec file for package yast2-online-update (Version 2.13.15)
#
# 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.16
-Release: 1
+Version: 2.13.15
+Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-online-update-2.13.16.tar.bz2
+Source0: yast2-online-update-2.13.15.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.16
+%setup -n yast2-online-update-2.13.15
%build
%{prefix}/bin/y2tool y2autoconf
@@ -114,14 +114,6 @@
%{prefix}/share/applications/YaST2/cd_update.desktop
%changelog -n yast2-online-update
-* 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.16.tar.bz2 -> yast2-online-update-2.13.15.tar.bz2 ++++++
++++ 11567 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.16/Makefile.am new/yast2-online-update-2.13.15/Makefile.am
--- old/yast2-online-update-2.13.16/Makefile.am 2006-03-13 14:17:20.000000000 +0100
+++ new/yast2-online-update-2.13.15/Makefile.am 2006-03-28 10:08:15.000000000 +0200
@@ -154,7 +154,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
TAGVERSION = $(PREFIX)/bin/y2tool tagversion
@@ -199,6 +199,9 @@
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.16/VERSION new/yast2-online-update-2.13.15/VERSION
--- old/yast2-online-update-2.13.16/VERSION 2006-03-29 17:21:25.000000000 +0200
+++ new/yast2-online-update-2.13.15/VERSION 2006-03-28 09:52:57.000000000 +0200
@@ -1 +1 @@
-2.13.16
+2.13.15
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.16/configure.in new/yast2-online-update-2.13.15/configure.in
--- old/yast2-online-update-2.13.16/configure.in 2006-03-13 14:17:20.000000000 +0100
+++ new/yast2-online-update-2.13.15/configure.in 2006-03-28 10:08:14.000000000 +0200
@@ -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.6, http://www.suse.de/feedback, yast2-online-update)
+AC_INIT(yast2-online-update, 2.13.15, 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.6"
+VERSION="2.13.15"
RPMNAME="yast2-online-update"
MAINTAINER="Michael Radziej "
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.16/src/OnlineUpdateCallbacks.ycp new/yast2-online-update-2.13.15/src/OnlineUpdateCallbacks.ycp
--- old/yast2-online-update-2.13.16/src/OnlineUpdateCallbacks.ycp 2006-03-29 17:21:01.000000000 +0200
+++ new/yast2-online-update-2.13.15/src/OnlineUpdateCallbacks.ycp 2006-03-28 09:50:31.000000000 +0200
@@ -83,18 +83,23 @@
return "";
}
- 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,
- ]
- ];
+ 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";
+ }
- OnlineUpdateDialogs::MessagePopup( patches, false );
+ return "";
}
global define void LogCallback( string text )
@@ -176,9 +181,8 @@
{
FinishLine ();
total_progress = total_progress + 1;
- if ( UI::WidgetExists( `id( `progress ) ) ) {
- UI::ChangeWidget( `id( `progress ), `Value, total_progress);
- }
+ if (!ProgressCallback (total_progress))
+ ret = (ErrorCallback ("abort", "", "") == "abort") ? "C" : "";
}
return ret;
}
@@ -196,9 +200,8 @@
{
FinishLine ();
total_progress = total_progress + 1;
- if ( UI::WidgetExists( `id( `progress ) ) ) {
- UI::ChangeWidget( `id( `progress ), `Value, total_progress);
- }
+ if (!ProgressCallback (total_progress))
+ ret = (ErrorCallback ("abort", "", "") == "abort") ? "C" : "";
}
return ret;
}
@@ -210,6 +213,10 @@
``{
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" );
@@ -218,11 +225,7 @@
Pkg::CallbackProgressPackage ("OnlineUpdateCallbacks::PatchProgressCallback");
Pkg::CallbackDonePackage( "OnlineUpdateCallbacks::DonePackage" );
- Pkg::CallbackResolvableReport ("OnlineUpdateCallbacks::MessageCallback");
-
- Pkg::CallbackYouProgress ("OnlineUpdateCallbacks::ProgressCallback");
- Pkg::CallbackYouPatchProgress ("OnlineUpdateCallbacks::PatchProgressCallback");
- Pkg::CallbackYouError ("OnlineUpdateCallbacks::ErrorCallback");
+ Pkg::CallbackYouMessage ("OnlineUpdateCallbacks::MessageCallback");
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.16/src/OnlineUpdateDialogs.ycp new/yast2-online-update-2.13.15/src/OnlineUpdateDialogs.ycp
--- old/yast2-online-update-2.13.16/src/OnlineUpdateDialogs.ycp 2006-03-29 09:05:04.000000000 +0200
+++ new/yast2-online-update-2.13.15/src/OnlineUpdateDialogs.ycp 2006-03-21 15:32:24.000000000 +0100
@@ -502,22 +502,19 @@
message = message + header;
message = message + "<pre>" + info + "</pre>";
-
+
+ details = details + header;
+
list<string> packages = patch[ "packages" ]:[];
- if( size( packages ) > 0 )
- {
- details = details + header;
+ details = details + _("<b>Packages:</b>");
- details = details + _("<b>Packages:</b>");
+ details = details + "<ul>";
- details = details + "<ul>";
+ foreach( string p, packages, ``{ details = details + "<li>" + p + "</li>"; } );
- foreach( string p, packages, ``{ details = details + "<li>" + p + "</li>"; } );
+ details = details + "</ul>";
- details = details + "</ul>";
- }
-
i = i + 1;
}
@@ -535,13 +532,13 @@
term buttons = nil;
if ( pre ) {
buttons = `HBox(
- details == "" ? `Empty : detailsButton,
+ detailsButton,
`PushButton( `id( `ok ), _("Install Patch") ),
`PushButton( `id( `skip ), _("Skip Patch") )
);
} else {
buttons = `HBox(
- details == "" ? `Empty : detailsButton,
+ 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.16/src/online_update_select.ycp new/yast2-online-update-2.13.15/src/online_update_select.ycp
--- old/yast2-online-update-2.13.16/src/online_update_select.ycp 2006-03-29 17:19:50.000000000 +0200
+++ new/yast2-online-update-2.13.15/src/online_update_select.ycp 2006-03-28 09:14:48.000000000 +0200
@@ -14,10 +14,6 @@
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...