Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Wed Apr 26 18:03:42 CEST 2006.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-04-25 14:31:29.000000000 +0200
+++ STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-04-26 13:02:11.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 26 12:53:42 CEST 2006 - lslezak@suse.cz
+
+- use other valid sources when a broken source is found (#168632)
+- 2.13.67
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-2.13.66.tar.bz2
New:
----
yast2-pkg-bindings-2.13.67.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.wASeuE/_old 2006-04-26 18:02:53.000000000 +0200
+++ /var/tmp/diff_new_pack.wASeuE/_new 2006-04-26 18:02:53.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.13.66)
+# spec file for package yast2-pkg-bindings (Version 2.13.67)
#
# Copyright (c) 2006 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.13.66
-Release: 1
+Version: 2.13.67
+Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.13.66.tar.bz2
+Source0: yast2-pkg-bindings-2.13.67.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 libzypp libzypp-devel perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools
Summary: YaST2 Package Manager Access
@@ -36,7 +36,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-pkg-bindings-2.13.66
+%setup -n yast2-pkg-bindings-2.13.67
%build
%{prefix}/bin/y2tool y2autoconf
@@ -67,6 +67,9 @@
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog -n yast2-pkg-bindings
+* Wed Apr 26 2006 - lslezak@suse.cz
+- use other valid sources when a broken source is found (#168632)
+- 2.13.67
* Tue Apr 25 2006 - lslezak@suse.cz
- updated callback handlers (#168060)
- 2.13.66
++++++ yast2-pkg-bindings-2.13.66.tar.bz2 -> yast2-pkg-bindings-2.13.67.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.66/VERSION new/yast2-pkg-bindings-2.13.67/VERSION
--- old/yast2-pkg-bindings-2.13.66/VERSION 2006-04-25 13:33:16.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.67/VERSION 2006-04-26 12:49:14.000000000 +0200
@@ -1 +1 @@
-2.13.66
+2.13.67
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.66/configure new/yast2-pkg-bindings-2.13.67/configure
--- old/yast2-pkg-bindings-2.13.66/configure 2006-04-25 13:33:46.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.67/configure 2006-04-26 12:58:35.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-pkg-bindings 2.13.66.
+# Generated by GNU Autoconf 2.59 for yast2-pkg-bindings 2.13.67.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-pkg-bindings'
PACKAGE_TARNAME='yast2-pkg-bindings'
-PACKAGE_VERSION='2.13.66'
-PACKAGE_STRING='yast2-pkg-bindings 2.13.66'
+PACKAGE_VERSION='2.13.67'
+PACKAGE_STRING='yast2-pkg-bindings 2.13.67'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -971,7 +971,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.13.66 to adapt to many kinds of systems.
+\`configure' configures yast2-pkg-bindings 2.13.67 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1038,7 +1038,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.66:";;
+ short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.67:";;
esac
cat <<\_ACEOF
@@ -1184,7 +1184,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-pkg-bindings configure 2.13.66
+yast2-pkg-bindings configure 2.13.67
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1198,7 +1198,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.13.66, which was
+It was created by yast2-pkg-bindings $as_me 2.13.67, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1928,7 +1928,7 @@
# Define the identity of the package.
PACKAGE='yast2-pkg-bindings'
- VERSION='2.13.66'
+ VERSION='2.13.67'
cat >>confdefs.h <<_ACEOF
@@ -2139,7 +2139,7 @@
-VERSION="2.13.66"
+VERSION="2.13.67"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Michael Andres "
@@ -20273,7 +20273,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-pkg-bindings $as_me 2.13.66, which was
+This file was extended by yast2-pkg-bindings $as_me 2.13.67, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20336,7 +20336,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-pkg-bindings config.status 2.13.66
+yast2-pkg-bindings config.status 2.13.67
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.66/configure.in new/yast2-pkg-bindings-2.13.67/configure.in
--- old/yast2-pkg-bindings-2.13.66/configure.in 2006-04-25 13:33:30.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.67/configure.in 2006-04-26 12:58:17.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 2.13.66, http://www.suse.de/feedback, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.13.67, http://www.suse.de/feedback, 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.13.66"
+VERSION="2.13.67"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Michael Andres "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.66/src/Callbacks.YCP.h new/yast2-pkg-bindings-2.13.67/src/Callbacks.YCP.h
--- old/yast2-pkg-bindings-2.13.66/src/Callbacks.YCP.h 2006-04-20 10:08:26.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.67/src/Callbacks.YCP.h 2006-04-26 11:31:26.000000000 +0200
@@ -332,7 +332,7 @@
bool evaluate() {
if ( _set && _func ) {
- y2debug ("Evaluating callback");
+ y2debug ("Evaluating callback (registered funciton: %s)", _func->name().c_str());
_result = _func->evaluateCall ();
delete _func;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.66/src/Source.cc new/yast2-pkg-bindings-2.13.67/src/Source.cc
--- old/yast2-pkg-bindings-2.13.66/src/Source.cc 2006-04-24 09:50:26.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.67/src/Source.cc 2006-04-26 12:48:39.000000000 +0200
@@ -89,18 +89,6 @@
success = false;
}
-
- if( enable->value() )
- {
- // go over all sources and get resolvables
- std::listzypp::SourceManager::SourceId ids = zypp::SourceManager::sourceManager()->enabledSources();
- for( std::listzypp::SourceManager::SourceId::iterator it = ids.begin(); it != ids.end(); ++it)
- {
- zypp::Source_Ref src = zypp::SourceManager::sourceManager()->findSource(*it);
- if( src.enabled() )
- zypp_ptr()->addResolvables (src.resolvables());
- }
- }
}
catch (const zypp::FailedSourcesRestoreException& excpt)
{
@@ -123,6 +111,40 @@
success = false;
}
+ if( enable->value() )
+ {
+ std::listzypp::SourceManager::SourceId ids;
+
+ // go over all sources and get resolvables
+ try
+ {
+ ids = zypp::SourceManager::sourceManager()->enabledSources();
+ }
+ catch (const zypp::Exception& excpt)
+ {
+ y2error ("Error in SourceStartManager: %s", excpt.asString().c_str());
+ _last_error.setLastError(excpt.asUserString());
+ success = false;
+ }
+
+ for( std::listzypp::SourceManager::SourceId::iterator it = ids.begin(); it != ids.end(); ++it)
+ {
+ try
+ {
+ zypp::Source_Ref src = zypp::SourceManager::sourceManager()->findSource(*it);
+
+ if( src.enabled() )
+ zypp_ptr()->addResolvables (src.resolvables());
+ }
+ catch (const zypp::Exception& excpt)
+ {
+ y2error ("Error in SourceStartManager: %s", excpt.asString().c_str());
+ _last_error.setLastError(excpt.asUserString());
+ success = false;
+ }
+ }
+ }
+
return YCPBoolean( success );
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...