Hello community,
here is the log from the commit of package yast2-pkg-bindings for
openSUSE:Factory
checked in at Mon Aug 1 14:21:33 CEST 2011.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2011-07-27
10:15:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes
2011-08-01 13:35:22.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Aug 1 09:28:55 UTC 2011 - lsle...@suse.cz
+
+- Pkg::SourceFinishAll() - remove upgrading repositories from the
+ solver, fixes solver crash when called later (bnc#709494)
+- 2.21.6
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-pkg-bindings-2.21.5.tar.bz2
New:
----
yast2-pkg-bindings-2.21.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.wwUIRx/_old 2011-08-01 14:20:49.000000000 +0200
+++ /var/tmp/diff_new_pack.wwUIRx/_new 2011-08-01 14:20:49.000000000 +0200
@@ -20,12 +20,12 @@
Name: yast2-pkg-bindings-devel-doc
-Version: 2.21.5
+Version: 2.21.6
Release: 1
License: GPL
Group: Documentation/HTML
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.21.5.tar.bz2
+Source0: yast2-pkg-bindings-2.21.6.tar.bz2
Prefix: %_prefix
# same as in the main package (because we use the same configure.in.in)
@@ -42,7 +42,7 @@
from the pkg-bindings sources.
%prep
-%setup -n yast2-pkg-bindings-2.21.5
+%setup -n yast2-pkg-bindings-2.21.6
# build only documentation, ignore all other directories
echo "doc" > SUBDIRS
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.wwUIRx/_old 2011-08-01 14:20:49.000000000 +0200
+++ /var/tmp/diff_new_pack.wwUIRx/_new 2011-08-01 14:20:49.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-pkg-bindings
-Version: 2.21.5
+Version: 2.21.6
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.21.5.tar.bz2
+Source0: yast2-pkg-bindings-2.21.6.tar.bz2
Prefix: /usr
@@ -46,7 +46,7 @@
library in YaST2.
%prep
-%setup -n yast2-pkg-bindings-2.21.5
+%setup -n yast2-pkg-bindings-2.21.6
# build only the library, ignore documentation (it is in devel-doc package)
echo "src" > SUBDIRS
++++++ yast2-pkg-bindings-2.21.5.tar.bz2 -> yast2-pkg-bindings-2.21.6.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-2.21.5/VERSION
new/yast2-pkg-bindings-2.21.6/VERSION
--- old/yast2-pkg-bindings-2.21.5/VERSION 2011-07-27 10:11:36.000000000
+0200
+++ new/yast2-pkg-bindings-2.21.6/VERSION 2011-08-01 11:31:16.000000000
+0200
@@ -1 +1 @@
-2.21.5
+2.21.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-2.21.5/configure
new/yast2-pkg-bindings-2.21.6/configure
--- old/yast2-pkg-bindings-2.21.5/configure 2011-07-27 10:12:20.000000000
+0200
+++ new/yast2-pkg-bindings-2.21.6/configure 2011-08-01 13:34:49.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-pkg-bindings 2.21.5.
+# Generated by GNU Autoconf 2.68 for yast2-pkg-bindings 2.21.6.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -570,8 +570,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-pkg-bindings'
PACKAGE_TARNAME='yast2-pkg-bindings'
-PACKAGE_VERSION='2.21.5'
-PACKAGE_STRING='yast2-pkg-bindings 2.21.5'
+PACKAGE_VERSION='2.21.6'
+PACKAGE_STRING='yast2-pkg-bindings 2.21.6'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1363,7 +1363,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.21.5 to adapt to many kinds of
systems.
+\`configure' configures yast2-pkg-bindings 2.21.6 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1435,7 +1435,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-pkg-bindings 2.21.5:";;
+ short | recursive ) echo "Configuration of yast2-pkg-bindings 2.21.6:";;
esac
cat <<\_ACEOF
@@ -1553,7 +1553,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-pkg-bindings configure 2.21.5
+yast2-pkg-bindings configure 2.21.6
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2006,7 +2006,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.21.5, which was
+It was created by yast2-pkg-bindings $as_me 2.21.6, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2936,7 +2936,7 @@
# Define the identity of the package.
PACKAGE='yast2-pkg-bindings'
- VERSION='2.21.5'
+ VERSION='2.21.6'
cat >>confdefs.h <<_ACEOF
@@ -3058,7 +3058,7 @@
-VERSION="2.21.5"
+VERSION="2.21.6"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák <lsle...@suse.cz>"
@@ -16660,7 +16660,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.21.5, which was
+This file was extended by yast2-pkg-bindings $as_me 2.21.6, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16726,7 +16726,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-pkg-bindings config.status 2.21.5
+yast2-pkg-bindings config.status 2.21.6
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-2.21.5/configure.in
new/yast2-pkg-bindings-2.21.6/configure.in
--- old/yast2-pkg-bindings-2.21.5/configure.in 2011-07-27 10:12:15.000000000
+0200
+++ new/yast2-pkg-bindings-2.21.6/configure.in 2011-08-01 13:34:44.000000000
+0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 2.21.5, http://bugs.opensuse.org/,
yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.21.6, http://bugs.opensuse.org/,
yast2-pkg-bindings)
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="2.21.5"
+VERSION="2.21.6"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák <lsle...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-2.21.5/src/Source_Save.cc
new/yast2-pkg-bindings-2.21.6/src/Source_Save.cc
--- old/yast2-pkg-bindings-2.21.5/src/Source_Save.cc 2011-04-06
13:52:57.000000000 +0200
+++ new/yast2-pkg-bindings-2.21.6/src/Source_Save.cc 2011-08-01
13:34:29.000000000 +0200
@@ -19,7 +19,7 @@
*/
/*
- File: $Id: Source_Save.cc 63716 2011-04-05 11:33:32Z lslezak $
+ File: $Id: Source_Save.cc 65103 2011-08-01 11:34:27Z lslezak $
Author: Ladislav Slezák <lsle...@novell.com>
Summary: Functions for saving repository configuration
Namespace: Pkg
@@ -244,6 +244,7 @@
* @description
* Release all known installation repositories. Releasing is done automaticaly
in Pkg::
* destructor, but can be done explicitly to force reloading of registered
repositories.
+ * Upgrade repositories are automatically removed from the solver.
* Use SourceSaveAll() to not loose the new registered sources before calling
SourceFinishAll()!
* @return boolean true on success
**/
@@ -261,6 +262,16 @@
RemoveResolvablesFrom(*it);
}
+ // remove all upgrading repositories from the solver before destructing
them
+ for_(it, zypp::ResPool::instance().knownRepositoriesBegin(),
zypp::ResPool::instance().knownRepositoriesEnd())
+ {
+ if (zypp_ptr()->resolver()->upgradingRepo(*it))
+ {
+ y2milestone("Removing upgrade repository '%s' (%s)",
it->name().c_str(), it->alias().c_str());
+ zypp_ptr()->resolver()->removeUpgradeRepo(*it);
+ }
+ }
+
// release all repositories
repos.clear();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
