Hello community,
here is the log from the commit of package yast2-metapackage-handler for openSUSE:Factory
checked in at Thu Apr 2 16:29:25 CEST 2009.
--------
--- yast2-metapackage-handler/yast2-metapackage-handler.changes 2009-02-12 12:33:04.000000000 +0100
+++ yast2-metapackage-handler/yast2-metapackage-handler.changes 2009-04-02 15:08:30.897380000 +0200
@@ -1,0 +2,7 @@
+Thu Apr 2 13:57:51 CEST 2009 - lslezak@suse.cz
+
+- properly initialize package slideshow, display correct
+ installation progress (bnc#482320)
+- 0.8.9
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-metapackage-handler-0.8.8.tar.bz2
New:
----
yast2-metapackage-handler-0.8.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-metapackage-handler.spec ++++++
--- /var/tmp/diff_new_pack.gc7282/_old 2009-04-02 16:27:49.000000000 +0200
+++ /var/tmp/diff_new_pack.gc7282/_new 2009-04-02 16:27:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-metapackage-handler (Version 0.8.8)
+# spec file for package yast2-metapackage-handler (Version 0.8.9)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,12 +20,12 @@
Url: http://en.opensuse.org/Meta_Packages
Name: yast2-metapackage-handler
-Version: 0.8.8
+Version: 0.8.9
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-metapackage-handler-0.8.8.tar.bz2
+Source0: yast2-metapackage-handler-0.8.9.tar.bz2
Prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig
@@ -67,7 +67,7 @@
Benjamin Weber
%prep
-%setup -n yast2-metapackage-handler-0.8.8
+%setup -n yast2-metapackage-handler-0.8.9
%if %suse_version <= 1020
%patch0
%endif
@@ -138,6 +138,10 @@
%{_datadir}/mime/packages/*.xml
%{_datadir}/applications/yast2-metapackage-handler*.desktop
%changelog
+* Thu Apr 02 2009 lslezak@suse.cz
+- properly initialize package slideshow, display correct
+ installation progress (bnc#482320)
+- 0.8.9
* Thu Feb 12 2009 coolo@suse.de
- make the desktop files more XDG compliant
- 0.8.8
++++++ yast2-metapackage-handler-0.8.8.tar.bz2 -> yast2-metapackage-handler-0.8.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.8/configure new/yast2-metapackage-handler-0.8.9/configure
--- old/yast2-metapackage-handler-0.8.8/configure 2009-02-12 12:33:36.000000000 +0100
+++ new/yast2-metapackage-handler-0.8.9/configure 2009-04-02 15:06:17.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-metapackage-handler 0.8.8.
+# Generated by GNU Autoconf 2.63 for yast2-metapackage-handler 0.8.9.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-metapackage-handler'
PACKAGE_TARNAME='yast2-metapackage-handler'
-PACKAGE_VERSION='0.8.8'
-PACKAGE_STRING='yast2-metapackage-handler 0.8.8'
+PACKAGE_VERSION='0.8.9'
+PACKAGE_STRING='yast2-metapackage-handler 0.8.9'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1274,7 +1274,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-metapackage-handler 0.8.8 to adapt to many kinds of systems.
+\`configure' configures yast2-metapackage-handler 0.8.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1346,7 +1346,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-metapackage-handler 0.8.8:";;
+ short | recursive ) echo "Configuration of yast2-metapackage-handler 0.8.9:";;
esac
cat <<\_ACEOF
@@ -1426,7 +1426,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-metapackage-handler configure 0.8.8
+yast2-metapackage-handler configure 0.8.9
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1440,7 +1440,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-metapackage-handler $as_me 0.8.8, which was
+It was created by yast2-metapackage-handler $as_me 0.8.9, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2287,7 +2287,7 @@
# Define the identity of the package.
PACKAGE='yast2-metapackage-handler'
- VERSION='0.8.8'
+ VERSION='0.8.9'
cat >>confdefs.h <<_ACEOF
@@ -2511,7 +2511,7 @@
-VERSION="0.8.8"
+VERSION="0.8.9"
RPMNAME="yast2-metapackage-handler"
MAINTAINER="Martin Vidner "
@@ -3459,7 +3459,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-metapackage-handler $as_me 0.8.8, which was
+This file was extended by yast2-metapackage-handler $as_me 0.8.9, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3509,7 +3509,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-metapackage-handler config.status 0.8.8
+yast2-metapackage-handler config.status 0.8.9
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.8/configure.in new/yast2-metapackage-handler-0.8.9/configure.in
--- old/yast2-metapackage-handler-0.8.8/configure.in 2009-02-12 12:33:31.000000000 +0100
+++ new/yast2-metapackage-handler-0.8.9/configure.in 2009-04-02 15:06:12.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-metapackage-handler, 0.8.8, http://bugs.opensuse.org/, yast2-metapackage-handler)
+AC_INIT(yast2-metapackage-handler, 0.8.9, http://bugs.opensuse.org/, yast2-metapackage-handler)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="0.8.8"
+VERSION="0.8.9"
RPMNAME="yast2-metapackage-handler"
MAINTAINER="Martin Vidner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.8/OneClickInstall.pot new/yast2-metapackage-handler-0.8.9/OneClickInstall.pot
--- old/yast2-metapackage-handler-0.8.8/OneClickInstall.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-metapackage-handler-0.8.9/OneClickInstall.pot 2007-12-10 16:00:12.000000000 +0100
@@ -0,0 +1,24 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-08-10 13:43+0200\n"
+"PO-Revision-Date: 2007-08-21 08:56+0200\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/OneClickInstallUI.ycp:77
+msgid "Advanced mode, with ability to change settings."
+msgstr "Advanced mode, with the ability to change settings."
+
+#: src/OneClickInstallWorkerResponse.ycp:8
+msgid "An unknown error occurred."
+msgstr "An unknown error occurred."
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.8/src/OneClickInstallWorkerFunctions.ycp new/yast2-metapackage-handler-0.8.9/src/OneClickInstallWorkerFunctions.ycp
--- old/yast2-metapackage-handler-0.8.8/src/OneClickInstallWorkerFunctions.ycp 2009-02-12 12:29:19.000000000 +0100
+++ new/yast2-metapackage-handler-0.8.9/src/OneClickInstallWorkerFunctions.ycp 2009-04-02 15:01:29.000000000 +0200
@@ -15,6 +15,8 @@
import "PackageCallbacks";
import "SourceManager";
import "Progress";
+ import "PackageSlideShow";
+ import "SlideShow";
import "CommandLine";
@@ -138,6 +140,26 @@
return addRepoSuccess;
}
+
+ void InitSlideShow(string description)
+ {
+ PackageSlideShow::InitPkgData(true); // force reinitialization
+
+ // TODO FIXME: doesn't work properly for removed packages
+ list< map > stages = [
+ $[
+ "name" : "packages",
+ "description": description,
+ "value" : PackageSlideShow::total_size_to_install / 1024 , // kilobytes
+ "units" : `kb,
+ ],
+ ];
+
+ SlideShow::Setup(stages);
+
+ SlideShow::MoveToStage("packages");
+ }
+
/**
** Install all the specified packages
** return true if all installations were successful, false otherwise
@@ -178,6 +200,9 @@
Pkg::TargetInit( "/", false );
if(Pkg::PkgSolve(true))
{
+ // initialize slideshow data (package counters)
+ InitSlideShow(_("Installing Packages..."));
+
print(_("Performing Installation..."));
state = !(Pkg::PkgCommit(0)[0]:-1 < 0);
} else //xxx no callback for resolve failures
@@ -216,6 +241,9 @@
if(Pkg::PkgSolve(true))
{
+ // initialize slideshow data (package counters)
+ InitSlideShow(_("Installing Patterns..."));
+
state = !(Pkg::PkgCommit(0)[0]:-1 < 0);
} else //xxx no callback for resolve failures
{
@@ -248,6 +276,9 @@
boolean state = true;
if(Pkg::PkgSolve(true))
{
+ // initialize slideshow data (package counters)
+ InitSlideShow(_("Removing Packages..."));
+
state = !(Pkg::PkgCommit(0)[0]:-1 < 0);
} else //xxx no callback for resolve failures
{
@@ -297,4 +328,4 @@
return nil;
}
-}
\ No newline at end of file
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.8/src/OneClickInstallWorker.ycp new/yast2-metapackage-handler-0.8.9/src/OneClickInstallWorker.ycp
--- old/yast2-metapackage-handler-0.8.8/src/OneClickInstallWorker.ycp 2009-02-12 12:29:19.000000000 +0100
+++ new/yast2-metapackage-handler-0.8.9/src/OneClickInstallWorker.ycp 2009-04-02 14:39:07.000000000 +0200
@@ -57,7 +57,6 @@
if (success)
{
SlideShow::SetLanguage (UI::GetLanguage(true));
- PackageSlideShow::InitPkgData(true);
SlideShow::Setup(
[$[
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.8/VERSION new/yast2-metapackage-handler-0.8.9/VERSION
--- old/yast2-metapackage-handler-0.8.8/VERSION 2009-02-12 12:33:08.000000000 +0100
+++ new/yast2-metapackage-handler-0.8.9/VERSION 2009-04-02 13:59:08.000000000 +0200
@@ -1 +1 @@
-0.8.8
+0.8.9
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
root＠Hilbert.suse.de