Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Thu May 17 18:24:06 CEST 2007.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2007-05-14 17:10:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2007-05-17 15:49:18.032459000 +0200
@@ -1,0 +2,9 @@
+Thu May 17 15:35:54 CEST 2007 - lslezak@suse.cz
+
+- Evaluate start/finish callbacks in Pkg::SourceRestore() and
+ Pkg::SourceLoad() only when needed (removed the flashing popup
+ effect during installation)
+- Log not applicable patches to y2log
+- 2.15.19
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-2.15.17.tar.bz2
New:
----
yast2-pkg-bindings-2.15.19.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.yT3791/_old 2007-05-17 18:23:57.000000000 +0200
+++ /var/tmp/diff_new_pack.yT3791/_new 2007-05-17 18:23:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.15.17)
+# spec file for package yast2-pkg-bindings (Version 2.15.19)
#
# 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-pkg-bindings
-Version: 2.15.17
-Release: 4
+Version: 2.15.19
+Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.15.17.tar.bz2
+Source0: yast2-pkg-bindings-2.15.19.tar.bz2
prefix: /usr
BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools
BuildRequires: libzypp-devel >= 2.14.3
@@ -40,7 +40,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-pkg-bindings-2.15.17
+%setup -n yast2-pkg-bindings-2.15.19
%build
%{prefix}/bin/y2tool y2autoconf
@@ -71,6 +71,12 @@
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog
+* Thu May 17 2007 - lslezak@suse.cz
+- Evaluate start/finish callbacks in Pkg::SourceRestore() and
+ Pkg::SourceLoad() only when needed (removed the flashing popup
+ effect during installation)
+- Log not applicable patches to y2log
+- 2.15.19
* Mon May 14 2007 - lslezak@suse.cz
- Pkg::TargetAvailable() returns -1 instead of uninitialized value
if an error occurs (#245734)
++++++ yast2-pkg-bindings-2.15.17.tar.bz2 -> yast2-pkg-bindings-2.15.19.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.17/configure new/yast2-pkg-bindings-2.15.19/configure
--- old/yast2-pkg-bindings-2.15.17/configure 2007-05-11 16:52:14.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.19/configure 2007-05-17 15:44:21.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.15.17.
+# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.15.19.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -713,8 +713,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-pkg-bindings'
PACKAGE_TARNAME='yast2-pkg-bindings'
-PACKAGE_VERSION='2.15.17'
-PACKAGE_STRING='yast2-pkg-bindings 2.15.17'
+PACKAGE_VERSION='2.15.19'
+PACKAGE_STRING='yast2-pkg-bindings 2.15.19'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1429,7 +1429,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-pkg-bindings 2.15.17 to adapt to many kinds of systems.
+\`configure' configures yast2-pkg-bindings 2.15.19 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1500,7 +1500,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-pkg-bindings 2.15.17:";;
+ short | recursive ) echo "Configuration of yast2-pkg-bindings 2.15.19:";;
esac
cat <<\_ACEOF
@@ -1608,7 +1608,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-pkg-bindings configure 2.15.17
+yast2-pkg-bindings configure 2.15.19
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1622,7 +1622,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-pkg-bindings $as_me 2.15.17, which was
+It was created by yast2-pkg-bindings $as_me 2.15.19, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2423,7 +2423,7 @@
# Define the identity of the package.
PACKAGE='yast2-pkg-bindings'
- VERSION='2.15.17'
+ VERSION='2.15.19'
cat >>confdefs.h <<_ACEOF
@@ -2650,7 +2650,7 @@
-VERSION="2.15.17"
+VERSION="2.15.19"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
@@ -21612,7 +21612,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-pkg-bindings $as_me 2.15.17, which was
+This file was extended by yast2-pkg-bindings $as_me 2.15.19, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21665,7 +21665,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-pkg-bindings config.status 2.15.17
+yast2-pkg-bindings config.status 2.15.19
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.17/configure.in new/yast2-pkg-bindings-2.15.19/configure.in
--- old/yast2-pkg-bindings-2.15.17/configure.in 2007-05-11 16:52:00.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.19/configure.in 2007-05-17 15:44:03.000000000 +0200
@@ -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-pkg-bindings, 2.15.17, http://bugs.opensuse.org/, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.15.19, http://bugs.opensuse.org/, yast2-pkg-bindings)
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.17"
+VERSION="2.15.19"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.17/src/Resolvable.cc new/yast2-pkg-bindings-2.15.19/src/Resolvable.cc
--- old/yast2-pkg-bindings-2.15.17/src/Resolvable.cc 2007-02-14 08:13:21.000000000 +0100
+++ new/yast2-pkg-bindings-2.15.19/src/Resolvable.cc 2007-05-16 15:50:09.000000000 +0200
@@ -597,9 +597,12 @@
i;
for (i = b; i != e; ++i)
{
- if (i->status().isNeeded()) { // uninstalled
- zypp::Patch::constPtr pch = zypp::asKindzypp::Patch(i->resolvable());
- if (pch)
+ zypp::Patch::constPtr pch = zypp::asKindzypp::Patch(i->resolvable());
+
+ // is it a patch?
+ if (pch)
+ {
+ if (i->status().isNeeded()) // uninstalled
{
// dont auto-install optional patches
if (pch->category () != "optional")
@@ -637,6 +640,10 @@
y2milestone("Ignoring optional patch (id): %s", pch->id().c_str());
}
}
+ else
+ {
+ y2milestone("Patch %s is not applicable", pch->id().c_str());
+ }
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.17/src/Source.cc new/yast2-pkg-bindings-2.15.19/src/Source.cc
--- old/yast2-pkg-bindings-2.15.17/src/Source.cc 2007-04-25 11:33:26.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.19/src/Source.cc 2007-05-17 13:57:01.000000000 +0200
@@ -160,8 +160,15 @@
YCPValue
PkgModuleFunctions::SourceRestore()
{
- CallSourceReportInit();
- CallSourceReportStart(_("Downloading files..."));
+ // evaluate the callbacks only when the source manager hasn't been initialized
+ bool enable_callbacks = zypp::SourceManager::sourceManager()->Source_begin()
+ == zypp::SourceManager::sourceManager()->Source_end();
+
+ if (enable_callbacks)
+ {
+ CallSourceReportInit();
+ CallSourceReportStart(_("Downloading files..."));
+ }
bool success = true;
@@ -195,8 +202,11 @@
success = false;
}
- CallSourceReportEnd(_("Downloading files..."));
- CallSourceReportDestroy();
+ if (enable_callbacks)
+ {
+ CallSourceReportEnd(_("Downloading files..."));
+ CallSourceReportDestroy();
+ }
return YCPBoolean(success);
}
@@ -235,9 +245,6 @@
{
bool success = true;
- CallSourceReportInit();
- CallSourceReportStart(_("Parsing files..."));
-
std::listzypp::SourceManager::SourceId ids;
// get all enabled sources
@@ -251,6 +258,8 @@
_last_error.setLastError(excpt.asUserString());
success = false;
}
+
+ bool callbacks_evaluated = false;
// load resolvables the enabled sources
for( std::listzypp::SourceManager::SourceId::iterator it = ids.begin(); it != ids.end(); ++it)
@@ -262,13 +271,30 @@
{
if( src.enabled() )
{
- zypp_ptr()->addResolvables (src.resolvables());
+ if (!src.resStoreInitialized ())
+ {
+ if (!callbacks_evaluated)
+ {
+ CallSourceReportInit();
+ CallSourceReportStart(_("Parsing files..."));
+ callbacks_evaluated = true;
+ }
+
+ zypp_ptr()->addResolvables (src.resolvables());
+ }
}
else
{
// remove the resolvables if they have been added
if (src.resStoreInitialized ())
{
+ if (!callbacks_evaluated)
+ {
+ CallSourceReportInit();
+ CallSourceReportStart(_("Parsing files..."));
+ callbacks_evaluated = true;
+ }
+
zypp_ptr()->removeResolvables(src.resolvables());
}
}
@@ -295,8 +321,11 @@
}
}
- CallSourceReportEnd(_("Parsing files..."));
- CallSourceReportDestroy();
+ if (callbacks_evaluated)
+ {
+ CallSourceReportEnd(_("Parsing files..."));
+ CallSourceReportDestroy();
+ }
return YCPBoolean(success);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.17/src/Target.cc new/yast2-pkg-bindings-2.15.19/src/Target.cc
--- old/yast2-pkg-bindings-2.15.17/src/Target.cc 2007-05-11 16:40:50.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.19/src/Target.cc 2007-05-14 17:06:02.000000000 +0200
@@ -292,7 +292,7 @@
struct statvfs sb;
if (statvfs (fs, &sb) < 0)
{
- *used = *size = *bsize = -1;
+ *used = *size = *bsize = *available = -1;
y2error("statvfs() failed: %s", strerror(errno));
return;
}
@@ -301,8 +301,7 @@
*used = (sb.f_blocks - sb.f_bfree) * *bsize;
*available = sb.f_bavail * *bsize; // available for non-root user
- y2milestone("Dir %s: sb.f_frsize: %lu, sb.f_bsize: %lu, sb.f_blocks: %lld, sb.f_bfree: %lld, sb.f_bavail: %lld, bsize: %lld, size: %lld, used: %lld, available: %lld", fs, sb.f_frsize, sb.f_bsize, sb.f_blocks, sb.f_bfree, sb.f_bavail, *bsize, *size, *used, *available);
-
+ y2debug("stavfs: dir: %s, sb.f_frsize: %lu, sb.f_bsize: %lu, sb.f_blocks: %lu, sb.f_bfree: %lu, sb.f_bavail: %lu, bsize: %lld, size: %lld, used: %lld, available: %lld", fs, sb.f_frsize, sb.f_bsize, sb.f_blocks, sb.f_bfree, sb.f_bavail, *bsize, *size, *used, *available);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.17/VERSION new/yast2-pkg-bindings-2.15.19/VERSION
--- old/yast2-pkg-bindings-2.15.17/VERSION 2007-05-11 16:44:18.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.19/VERSION 2007-05-17 15:35:50.000000000 +0200
@@ -1 +1 @@
-2.15.17
+2.15.19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org