Hello community,
here is the log from the commit of package yast2-online-update
checked in at Mon Sep 17 17:08:59 CEST 2007.
--------
--- yast2-online-update/yast2-online-update.changes 2007-09-14 22:11:09.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-online-update/yast2-online-update.changes 2007-09-17 10:54:20.950417000 +0200
@@ -1,0 +2,6 @@
+Mon Sep 17 10:39:22 CEST 2007 - jsuchome@suse.cz
+
+- register download callbacks (#309127)
+- 2.15.22
+
+-------------------------------------------------------------------
Old:
----
yast2-online-update-2.15.21.tar.bz2
New:
----
yast2-online-update-2.15.22.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-online-update.spec ++++++
--- /var/tmp/diff_new_pack.H27904/_old 2007-09-17 17:08:47.000000000 +0200
+++ /var/tmp/diff_new_pack.H27904/_new 2007-09-17 17:08:47.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-online-update (Version 2.15.21)
+# spec file for package yast2-online-update (Version 2.15.22)
#
# Copyright (c) 2007 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.15.21
+Version: 2.15.22
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-online-update-2.15.21.tar.bz2
+Source0: yast2-online-update-2.15.22.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
@@ -48,7 +48,7 @@
gs@suse.de
%prep
-%setup -n yast2-online-update-2.15.21
+%setup -n yast2-online-update-2.15.22
%build
%{prefix}/bin/y2tool y2autoconf
@@ -149,6 +149,9 @@
%ghost %{prefix}/share/applications/YaST2/cd_update.desktop
%changelog
+* Mon Sep 17 2007 - jsuchome@suse.cz
+- register download callbacks (#309127)
+- 2.15.22
* Fri Sep 14 2007 - jsuchome@suse.cz
- show random time only in Mode::config (#310384)
- 2.15.21
++++++ yast2-online-update-2.15.21.tar.bz2 -> yast2-online-update-2.15.22.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.21/src/AutoOnlineUpdate.ycp new/yast2-online-update-2.15.22/src/AutoOnlineUpdate.ycp
--- old/yast2-online-update-2.15.21/src/AutoOnlineUpdate.ycp 2007-09-14 21:09:45.000000000 +0200
+++ new/yast2-online-update-2.15.22/src/AutoOnlineUpdate.ycp 2007-09-14 22:11:35.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for configuration of AutoOnlineUpdate, input and output functions.
* Authors: Anas Nashif
*
- * $Id: AutoOnlineUpdate.ycp 38516 2007-06-19 07:07:14Z jsuchome $
+ * $Id: AutoOnlineUpdate.ycp 40924 2007-09-14 20:11:34Z jsuchome $
*
* Representation of the configuration of AutoOnlineUpdate.
* Input and output routines.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.21/src/OnlineUpdateCallbacks.ycp new/yast2-online-update-2.15.22/src/OnlineUpdateCallbacks.ycp
--- old/yast2-online-update-2.15.21/src/OnlineUpdateCallbacks.ycp 2007-05-24 13:24:10.000000000 +0200
+++ new/yast2-online-update-2.15.22/src/OnlineUpdateCallbacks.ycp 2007-09-17 10:39:14.000000000 +0200
@@ -35,9 +35,9 @@
// last_callback = "PatchProgressCallback";
y2debug("PatchProgressCallback %1", num);
-
- if ( UI::WidgetExists( `id( `patchprogress ) ) ) {
- UI::ChangeWidget( `id( `patchprogress ), `Value, num );
+Popup::Message (sformat ("PatchProgressCallback %1", num));
+ if ( UI::WidgetExists( `id( `you_patch_progress ) ) ) {
+ UI::ChangeWidget( `id( `you_patch_progress ), `Value, num );
}
if (aborted) return false;
@@ -52,6 +52,12 @@
return true;
}
+ global boolean ProgressDownloadCallback (integer percent, integer expected_size)
+ {
+ y2debug ("ProgressDownloadCallback %1, %2", percent, expected_size);
+ return PatchProgressCallback (percent);
+ }
+
global void MessageCallback( string patchname, string patchsummary, string message )
{
last_callback = "MessageCallback";
@@ -111,17 +117,33 @@
{
// progress log item (%1 is name of package)
ProgressLog (sformat (_("Retrieving %1..."), name));
- if (UI::WidgetExists (`id (`patchprogress)))
+ if (UI::WidgetExists (`id (`you_patch_progress)))
{
- UI::ChangeWidget (`id (`patchprogress), `Label,
+ UI::ChangeWidget (`id (`you_patch_progress), `Label,
// progress bar label
_("Package Download Progress"));
- UI::ChangeWidget (`id (`patchprogress), `Value, 0);
+ UI::ChangeWidget (`id (`you_patch_progress), `Value, 0);
}
last_callback = "StartProvide";
return true;
}
+ global void StartDownload (string url, string localfile)
+ {
+ /*
+ // reformat the URL
+ string url_report = URL::FormatURL(URL::Parse(url), max_size);
+
+ FIXME new text to ProgressLog?
+ // progress log item (%1 is name of file)
+ string message = sformat (_("Downloading: %1"), url_report);
+ ProgressLog (message);
+ // + progress to 0?
+ */
+ last_callback = "StartDownload";
+ }
+
+
/**
Callback for starting installation of a package.
*/
@@ -130,12 +152,12 @@
{
// progress log item (%1 is name of package, %2 is summary)
ProgressLog( sformat( _("Installing %1: \"%2\" "), name, summary ) );
- if (UI::WidgetExists (`id (`patchprogress)))
+ if (UI::WidgetExists (`id (`you_patch_progress)))
{
- UI::ChangeWidget (`id (`patchprogress), `Label,
+ UI::ChangeWidget (`id (`you_patch_progress), `Label,
// progress bar label
_("Package Installation Progress"));
- UI::ChangeWidget (`id (`patchprogress), `Value, 0);
+ UI::ChangeWidget (`id (`you_patch_progress), `Value, 0);
}
last_callback = "StartPackage";
return true;
@@ -166,8 +188,8 @@
{
FinishLine (true);
total_progress = total_progress + 1;
- if ( UI::WidgetExists( `id( `progress ) ) ) {
- UI::ChangeWidget( `id( `progress ), `Value, total_progress);
+ if ( UI::WidgetExists( `id( `you_total_progress ) ) ) {
+ UI::ChangeWidget( `id( `you_total_progress ), `Value, total_progress);
}
}
last_callback = "DonePackage";
@@ -188,29 +210,35 @@
if (last_callback == "StartProvide")
FinishLine (false);
total_progress = total_progress + 1;
- if ( UI::WidgetExists( `id( `progress ) ) ) {
- UI::ChangeWidget( `id( `progress ), `Value, total_progress);
+ if ( UI::WidgetExists( `id( `you_total_progress ) ) ) {
+ UI::ChangeWidget( `id( `you_total_progress ), `Value, total_progress);
}
}
last_callback = "DoneProvide";
return ret;
}
+ global void DoneDownload (integer error_value, string error_text) {
+ PackageCallbacks::DoneDownload (error_value, error_text); if (last_callback != "FinishPatchDeltaProvide")
+ FinishLine (false);
+ last_callback = "DoneDownload";
+ }
+
/**
* callback for start of delta download
*/
global void StartDeltaDownload (string name, integer download_size) {
// progress log item (%1 is name of delta RPM
- if (last_callback == "StartProvide")
+ if (last_callback == "StartProvide" || last_callback == "StartDownload")
ProgressLog ("\n" + indent);
ProgressLog (sformat(_("Downloading delta RPM %1"), name));
- if (UI::WidgetExists (`id (`patchprogress)))
+ if (UI::WidgetExists (`id (`you_patch_progress)))
{
- UI::ChangeWidget (`id (`patchprogress), `Label,
+ UI::ChangeWidget (`id (`you_patch_progress), `Label,
// progress bar label
_("Delta RPM Download Progress"));
- UI::ChangeWidget (`id (`patchprogress), `Value, 0);
+ UI::ChangeWidget (`id (`you_patch_progress), `Value, 0);
}
last_callback = "StartDeltaDownload";
}
@@ -247,12 +275,12 @@
global void StartDeltaApply (string name) {
// progress log item (%1 is name of delta RPM)
ProgressLog (indent + sformat(_("Applying delta RPM: %1"), name));
- if (UI::WidgetExists (`id (`patchprogress)))
+ if (UI::WidgetExists (`id (`you_patch_progress)))
{
- UI::ChangeWidget (`id (`patchprogress), `Label,
+ UI::ChangeWidget (`id (`you_patch_progress), `Label,
// progress bar label
_("Delta RPM Application Progress"));
- UI::ChangeWidget (`id (`patchprogress), `Value, 0);
+ UI::ChangeWidget (`id (`you_patch_progress), `Value, 0);
}
last_callback = "StartDeltaApply";
}
@@ -263,8 +291,8 @@
*/
global void ProgressDeltaApply (integer num) {
y2debug ("ProgressDeltaApply: %1", num);
- if (UI::WidgetExists (`id (`patchprogress))) {
- UI::ChangeWidget (`id (`patchprogress), `Value, num);
+ if (UI::WidgetExists (`id (`you_patch_progress))) {
+ UI::ChangeWidget (`id (`you_patch_progress), `Value, num);
}
last_callback = "ProgressDeltaApply";
}
@@ -292,12 +320,12 @@
if (last_callback == "StartProvide")
ProgressLog ("\n" + indent);
ProgressLog (sformat(_("Downloading patch RPM %1"), name));
- if (UI::WidgetExists (`id (`patchprogress)))
+ if (UI::WidgetExists (`id (`you_patch_progress)))
{
- UI::ChangeWidget (`id (`patchprogress), `Label,
+ UI::ChangeWidget (`id (`you_patch_progress), `Label,
// progress bar label
_("Patch RPM Download Progress"));
- UI::ChangeWidget (`id (`patchprogress), `Value, 0);
+ UI::ChangeWidget (`id (`you_patch_progress), `Value, 0);
}
last_callback = "StartPatchDownload";
}
@@ -343,12 +371,12 @@
y2milestone("ScriptStart: patch_name:%1, patch_version:%2, patch_arch:%3, script:%4, installation:%5", patch_name, patch_version, patch_arch, script_path, installation);
string patch_full_name = PackageCallbacks::FormatPatchName(patch_name, patch_version, patch_arch);
- if (UI::WidgetExists(`id(`patchprogress)))
+ if (UI::WidgetExists(`id(`you_patch_progress)))
{
- UI::ChangeWidget(`id(`patchprogress), `Label,
+ UI::ChangeWidget(`id(`you_patch_progress), `Label,
// progress bar label
_("Script Execution Progress"));
- UI::ChangeWidget(`id(`patchprogress), `Value, 0);
+ UI::ChangeWidget(`id(`you_patch_progress), `Value, 0);
}
// log entry, %1 is name of the patch which contains the script
@@ -399,16 +427,16 @@
{
y2milestone("ScriptFinish");
- if (UI::WidgetExists(`id(`patchprogress)))
+ if (UI::WidgetExists(`id(`you_patch_progress)))
{
- UI::ChangeWidget(`id(`patchprogress), `Value, 100);
+ UI::ChangeWidget(`id(`you_patch_progress), `Value, 100);
}
FinishLine(true);
total_progress = total_progress + 1;
- if (UI::WidgetExists(`id( `progress )))
+ if (UI::WidgetExists(`id( `you_total_progress )))
{
- UI::ChangeWidget(`id(`progress), `Value, total_progress);
+ UI::ChangeWidget(`id(`you_total_progress), `Value, total_progress);
}
last_callback = "ScriptFinish";
@@ -448,7 +476,11 @@
Pkg::CallbackProgressPackage ("OnlineUpdateCallbacks::PatchProgressCallback");
Pkg::CallbackDonePackage( "OnlineUpdateCallbacks::DonePackage" );
- Pkg::CallbackResolvableReport ("OnlineUpdateCallbacks::MessageCallback");
+ Pkg::CallbackResolvableReport("OnlineUpdateCallbacks::MessageCallback");
+
+ Pkg::CallbackStartDownload( "OnlineUpdateCallbacks::StartDownload" );
+ Pkg::CallbackProgressDownload( "OnlineUpdateCallbacks::ProgressDownloadCallback" );
+ Pkg::CallbackDoneDownload ("OnlineUpdateCallbacks::DoneDownload");
Pkg::CallbackMediaChange ("PackageCallbacks::MediaChange");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.21/src/online_update_install.ycp new/yast2-online-update-2.15.22/src/online_update_install.ycp
--- old/yast2-online-update-2.15.21/src/online_update_install.ycp 2007-04-26 15:36:23.000000000 +0200
+++ new/yast2-online-update-2.15.22/src/online_update_install.ycp 2007-09-17 10:01:30.000000000 +0200
@@ -27,11 +27,11 @@
`LogView(`id(`log), _("Progress Log"), 5, 0 ),
`VSpacing( 0.5 ),
// progress bar label
- `ProgressBar( `id( `patchprogress ), _("Package Progress") ),
+ `ProgressBar( `id( `you_patch_progress ), _("Package Progress") ),
`VSpacing( 0.2 ),
`ReplacePoint (`id(`rpprogress),
// progress bar label
- `ProgressBar( `id( `progress ), _("Total Progress") )
+ `ProgressBar( `id( `you_total_progress ), _("Total Progress") )
),
`VSpacing( 0.5 ),
`VSpacing( 0.2 )
@@ -62,7 +62,7 @@
UI::ReplaceWidget (`id(`rpprogress),
// progress bar label
- `ProgressBar( `id( `progress ), _("Total Progress"), total_progress)
+ `ProgressBar( `id( `you_total_progress ), _("Total Progress"), total_progress)
);
// FIXME no chance to get this after Commit (bug 188556)
@@ -87,8 +87,8 @@
changed_packages = changed_packages || commit[0]:0 > 0;
- UI::ChangeWidget( `id( `patchprogress ), `Value, 100 );
- UI::ChangeWidget( `id( `progress ), `Value, total_progress);
+ UI::ChangeWidget( `id( `you_patch_progress ), `Value, 100 );
+ UI::ChangeWidget( `id( `you_total_progress ), `Value, total_progress);
symbol ret = `next;
if (!Stage::cont ())
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.21/VERSION new/yast2-online-update-2.15.22/VERSION
--- old/yast2-online-update-2.15.21/VERSION 2007-08-14 13:31:08.000000000 +0200
+++ new/yast2-online-update-2.15.22/VERSION 2007-09-17 10:39:47.000000000 +0200
@@ -1 +1 @@
-2.15.21
+2.15.22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org