Hello community,
here is the log from the commit of package yast2-packager
checked in at Fri Feb 16 07:43:13 CET 2007.
--------
--- yast2-packager/yast2-packager.changes 2007-02-13 12:53:50.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-02-15 07:40:53.054708000 +0100
@@ -1,0 +2,6 @@
+Thu Feb 15 07:36:50 CET 2007 - lslezak@suse.cz
+
+- handlers for ScanDB callbacks (RPM DB reading) (#219953)
+- 2.15.12
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.15.11.tar.bz2
New:
----
yast2-packager-2.15.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.o27431/_old 2007-02-16 07:39:16.000000000 +0100
+++ /var/tmp/diff_new_pack.o27431/_new 2007-02-16 07:39:16.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.15.11)
+# spec file for package yast2-packager (Version 2.15.12)
#
# 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-packager
-Version: 2.15.11
+Version: 2.15.12
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.15.11.tar.bz2
+Source0: yast2-packager-2.15.12.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml
Requires: yast2-country
@@ -45,7 +45,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.15.11
+%setup -n yast2-packager-2.15.12
%build
%{prefix}/bin/y2tool y2autoconf
@@ -83,6 +83,9 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Thu Feb 15 2007 - lslezak@suse.cz
+- handlers for ScanDB callbacks (RPM DB reading) (#219953)
+- 2.15.12
* Tue Feb 13 2007 - locilka@suse.cz
- Calling bind mount and removing devs.rpm only in case of upgrade
(#244937).
++++++ yast2-packager-2.15.11.tar.bz2 -> yast2-packager-2.15.12.tar.bz2 ++++++
++++ 2962 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-packager-2.15.11/configure.in new/yast2-packager-2.15.12/configure.in
--- old/yast2-packager-2.15.11/configure.in 2007-02-13 13:59:47.000000000 +0100
+++ new/yast2-packager-2.15.12/configure.in 2007-02-12 13:02:50.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.15.11, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.15.10, http://bugs.opensuse.org/, yast2-packager)
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.15.11"
+VERSION="2.15.10"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
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-packager-2.15.11/src/modules/PackageCallbacks.ycp new/yast2-packager-2.15.12/src/modules/PackageCallbacks.ycp
--- old/yast2-packager-2.15.11/src/modules/PackageCallbacks.ycp 2007-02-07 09:24:51.000000000 +0100
+++ new/yast2-packager-2.15.12/src/modules/PackageCallbacks.ycp 2007-02-15 07:16:47.000000000 +0100
@@ -29,6 +29,7 @@
global boolean _source_popup = false;
global boolean _package_popup = false;
global boolean _script_popup = false;
+ global boolean _scan_popup = false;
global string _package_name = "";
global integer _package_size = 0;
@@ -1669,5 +1670,192 @@
}
+
+/**
+ * Callback for start RPM DB scan event
+ */
+global void StartScanDb()
+{
+ y2milestone("Scanning RPM DB...");
+
+ if (Mode::commandline()) {
+ // progress message (command line mode)
+ CommandLine::PrintVerbose(_("Reading RPM DB..."));
+ }
+ else
+ {
+ UI::OpenDialog(
+ `VBox(
+ `HSpacing(60),
+ // popup heading
+ `Heading(`id(`label_scanDB_popup), `opt(`hstretch), _("Initializing Target System...")),
+ `HBox(
+ // progress bar label
+ `ProgressBar (`id (`progress), _("Scanning RPM Database..."), 100, 0),
+ `HSpacing(1)
+/* TODO: allow Abort
+ ,
+ `VBox(
+ `Label(""),
+ `PushButton(`id(`abort), Label::AbortButton())
+ )
+*/
+ )
+ )
+ );
+
+ _scan_popup = true;
+ }
+}
+
+/**
+ * Callback for RPM DB scan progress
+ */
+global boolean ProgressScanDb(integer value)
+{
+ if (Mode::commandline())
+ {
+ CommandLine::PrintVerboseNoCR(clear_string + sformat("%1%%", value));
+ }
+ else
+ {
+ if (_scan_popup && UI::WidgetExists(`id(`label_scanDB_popup)))
+ {
+ UI::ChangeWidget(`id(`progress), `Value, value);
+ boolean cont = UI::PollInput () != `abort;
+
+ if (!cont)
+ {
+ y2warning("Scan DB aborted");
+ }
+
+ return cont;
+ }
+ }
+
+ // continue
+ return true;
+}
+
+/**
+ * Callback for error handling during RPM DB scan
+ */
+global string ErrorScanDb(integer error, string description)
+{
+ y2error("ErrorScanDb callback: error: %1, description: %2", error, description);
+
+ // error message, could not read RPM database
+ string message = _("Initialization of the target failed.");
+
+ if (Mode::commandline())
+ {
+ CommandLine::Print(message);
+ CommandLine::Print(description);
+
+ // ask user in the interactive mode
+ if (CommandLine::Interactive())
+ {
+ CommandLine::Print("");
+
+ // command line mode - ask user whether target initializatin can be restarted
+ CommandLine::Print(_("Retry?"));
+
+ if (CommandLine::YesNo())
+ {
+ // return Retry
+ return "R";
+ }
+ }
+
+ // return Cancel
+ return "C";
+ }
+
+ boolean show_details = false;
+
+ term button_box = `HBox
+ (
+ `PushButton (`id(`abort), Label::AbortButton()),
+ `PushButton(`id(`retry), Label::RetryButton()),
+ `PushButton(`id(`ignore), Label::IgnoreButton())
+ );
+
+ UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, 1, false) );
+
+ any r = nil;
+
+ repeat
+ {
+ r = UI::UserInput();
+ if ( r == `show )
+ {
+ show_details = ShowLogInfo (message, button_box);
+ if (show_details)
+ {
+ string error_symbol = "UNKNOWN";
+
+ if (error == 0)
+ {
+ error_symbol = "NO_ERROR";
+ }
+ else if (error == 1)
+ {
+ error_symbol = "FAILED";
+ }
+
+ UI::ReplaceWidget(`id(`info),
+ `RichText (`opt(`plainText),
+ // error message, %1 is code of the error,
+ // detail string is appended to the end
+ sformat (_("Error: %1:"), error_symbol) + description) );
+ }
+ else
+ {
+ UI::ReplaceWidget(`id(`info), `Empty() );
+ }
+ }
+ } until (r == `abort || r == `retry || r == `ignore);
+
+ y2milestone ("ErrorScanDb: user input: %1", r);
+
+ UI::CloseDialog();
+
+ if (r == `abort)
+ return "C";
+ if (r == `retry)
+ return "R";
+ if (r == `ignore)
+ return "I";
+
+ y2error("Unknown user input: %1", r);
+
+ return "C";
+}
+
+/**
+ * Callback for finish RPM DB scan event
+ */
+global void DoneScanDb(integer error, string description)
+{
+ y2milestone("RPM DB scan finished: error: %1, reason: '%2'", error, description);
+
+ if (Mode::commandline()) {
+ // status message (command line mode)
+ CommandLine::PrintVerbose(_("RPM DB read"));
+ }
+ else
+ {
+ if (_scan_popup && UI::WidgetExists(`id(`label_scanDB_popup)))
+ {
+ UI::CloseDialog();
+ _scan_popup = false;
+ }
+ else
+ {
+ y2error("The toplevel dialog is not a scan DB popup!");
+ }
+ }
+}
+
// EOF
}
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-packager-2.15.11/src/modules/test.ycp new/yast2-packager-2.15.12/src/modules/test.ycp
--- old/yast2-packager-2.15.11/src/modules/test.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-packager-2.15.12/src/modules/test.ycp 2007-02-14 16:46:43.000000000 +0100
@@ -0,0 +1,5 @@
+{
+ import "PackageCallbacks";
+
+ PackageCallbacks::ErrorScanDb(1, ";;;;;;;;;;sdfdf sdffd sdfgds sdfghdf dsgfdsf");
+}
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-packager-2.15.11/VERSION new/yast2-packager-2.15.12/VERSION
--- old/yast2-packager-2.15.11/VERSION 2007-02-13 12:52:51.000000000 +0100
+++ new/yast2-packager-2.15.12/VERSION 2007-02-15 07:38:51.000000000 +0100
@@ -1 +1 @@
-2.15.11
+2.15.12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org