Mailinglist Archive: opensuse-commit (1187 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package yast2-pkg-bindings
checked in at Wed Apr 19 13:51:41 CEST 2006.

--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes	2006-04-14 16:55:37.000000000 +0200
+++ STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes	2006-04-19 10:36:27.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 19 10:33:33 CEST 2006 - visnov@xxxxxxx
+
+- ignore finish with errors in DonePackage callback to be retried (#161298)
+- 2.13.60
+
+-------------------------------------------------------------------

Old:
----
  yast2-pkg-bindings-2.13.59.tar.bz2

New:
----
  yast2-pkg-bindings-2.13.60.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.zByOsZ/_old	2006-04-19 13:51:15.000000000 +0200
+++ /var/tmp/diff_new_pack.zByOsZ/_new	2006-04-19 13:51:15.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-pkg-bindings (Version 2.13.59)
+# spec file for package yast2-pkg-bindings (Version 2.13.60)
 #
 # 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.59
+Version:        2.13.60
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-pkg-bindings-2.13.59.tar.bz2
+Source0:        yast2-pkg-bindings-2.13.60.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 <visnov@xxxxxxx>
 
 %prep
-%setup -n yast2-pkg-bindings-2.13.59
+%setup -n yast2-pkg-bindings-2.13.60
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -67,6 +67,9 @@
 %doc %{prefix}/share/doc/packages/yast2-pkg-bindings
 
 %changelog -n yast2-pkg-bindings
+* Wed Apr 19 2006 - visnov@xxxxxxx
+- ignore finish with errors in DonePackage callback to be retried (#161298)
+- 2.13.60
 * Fri Apr 14 2006 - visnov@xxxxxxx
 - Adapt for new digest callbacks in ZYPP
 - 2.13.59

++++++ yast2-pkg-bindings-2.13.59.tar.bz2 -> yast2-pkg-bindings-2.13.60.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.59/VERSION new/yast2-pkg-bindings-2.13.60/VERSION
--- old/yast2-pkg-bindings-2.13.59/VERSION	2006-04-14 16:53:55.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.60/VERSION	2006-04-19 10:34:46.000000000 +0200
@@ -1 +1 @@
-2.13.59
+2.13.60
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.59/src/Callbacks.cc new/yast2-pkg-bindings-2.13.60/src/Callbacks.cc
--- old/yast2-pkg-bindings-2.13.59/src/Callbacks.cc	2006-04-14 16:03:49.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.60/src/Callbacks.cc	2006-04-19 10:18:01.000000000 +0200
@@ -278,6 +278,12 @@
 
 	virtual void finish(zypp::Resolvable::constPtr resolvable, Error error, std::string reason, zypp::target::rpm::InstallResolvableReport::RpmLevel level)
 	{
+	    if (error != zypp::target::rpm::InstallResolvableReport::NO_ERROR && level != zypp::target::rpm::InstallResolvableReport::RPM_NODEPS_FORCE)
+	    {
+		y2milestone( "Skipping finish due to retrying installation problem with too low severity (%d)", level);
+		return;
+	    }
+	    
 	    CB callback( ycpcb( YCPCallbacks::CB_DonePackage) );
 	    if (callback._set) {
 		callback.addInt( level == zypp::target::rpm::InstallResolvableReport::RPM_NODEPS_FORCE ? error : NO_ERROR);


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...