commit yast2-pkg-bindings

3 Apr 2006

Hello community,

here is the log from the commit of package yast2-pkg-bindings
checked in at Mon Apr 3 20:27:06 CEST 2006.

--------

--- yast2-pkg-bindings/yast2-pkg-bindings.changes	2006-04-03 15:24:19.000000000 +0200
+++ yast2-pkg-bindings/yast2-pkg-bindings.changes	2006-04-03 19:28:43.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Apr  3 19:25:55 CEST 2006 - kkaempf@suse.de
+
+- new callback: Pkg::PkgFreshen() (#156980)
+- 2.13.45
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.0YwiIa/_old	2006-04-03 20:20:35.000000000 +0200
+++ /var/tmp/diff_new_pack.0YwiIa/_new	2006-04-03 20:20:35.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-pkg-bindings (Version 2.13.44)
+# spec file for package yast2-pkg-bindings (Version 2.13.45)
 #
 # 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.44
+Version:        2.13.45
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-pkg-bindings-2.13.44.tar.bz2
+Source0:        yast2-pkg-bindings-2.13.45.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@suse.cz>
 
 %prep
-%setup -n yast2-pkg-bindings-2.13.44
+%setup -n yast2-pkg-bindings-2.13.45
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -67,6 +67,9 @@
 %doc %{prefix}/share/doc/packages/yast2-pkg-bindings
 
 %changelog -n yast2-pkg-bindings
+* Mon Apr 03 2006 - kkaempf@suse.de
+- new callback: Pkg::PkgFreshen() (#156980)
+- 2.13.45
 * Mon Apr 03 2006 - lslezak@suse.cz
 - new callbacks: Pkg::CallbackAcceptUnknownGpgKey(),
   Pkg::CallbackAcceptUnsignedFile(),

++++++ yast2-pkg-bindings-2.13.44.tar.bz2 -> yast2-pkg-bindings-2.13.45.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.44/Makefile.am new/yast2-pkg-bindings-2.13.45/Makefile.am
--- old/yast2-pkg-bindings-2.13.44/Makefile.am	2006-03-27 16:16:48.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.45/Makefile.am	2006-02-08 17:37:32.000000000 +0100
@@ -154,7 +154,7 @@
 	    $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
 	done
 
-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-all-packages package-local
 
 TAGVERSION	 = $(PREFIX)/bin/y2tool tagversion
 
@@ -199,9 +199,6 @@
 		false;							\
 	fi
 
-check-textdomain:
-	$(PREFIX)/bin/y2tool check-textdomain $(srcdir)
-
 stable: checkin-stable
 
 checkin-stable: package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.44/Makefile.in new/yast2-pkg-bindings-2.13.45/Makefile.in
--- old/yast2-pkg-bindings-2.13.44/Makefile.in	2006-03-27 16:17:07.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.45/Makefile.in	2006-02-08 17:37:46.000000000 +0100
@@ -855,7 +855,7 @@
 	    $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
 	done
 
-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-all-packages package-local
 
 check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
 	if [ -d $(srcdir)/CVS ]; then \
@@ -898,9 +898,6 @@
 		false;							\
 	fi
 
-check-textdomain:
-	$(PREFIX)/bin/y2tool check-textdomain $(srcdir)
-
 stable: checkin-stable
 
 checkin-stable: package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.44/VERSION new/yast2-pkg-bindings-2.13.45/VERSION
--- old/yast2-pkg-bindings-2.13.44/VERSION	2006-04-03 15:17:20.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.45/VERSION	2006-04-03 19:26:33.000000000 +0200
@@ -1 +1 @@
-2.13.44
+2.13.45
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.44/configure new/yast2-pkg-bindings-2.13.45/configure
--- old/yast2-pkg-bindings-2.13.44/configure	2006-03-27 16:17:02.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.45/configure	2006-02-08 17:37:41.000000000 +0100
@@ -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.41.
+# Generated by GNU Autoconf 2.59 for yast2-pkg-bindings 2.13.1.7.
 #
 # 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.41'
-PACKAGE_STRING='yast2-pkg-bindings 2.13.41'
+PACKAGE_VERSION='2.13.1.7'
+PACKAGE_STRING='yast2-pkg-bindings 2.13.1.7'
 PACKAGE_BUGREPORT='http://www.suse.de/feedback'
 
 ac_unique_file="RPMNAME"
@@ -959,7 +959,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.41 to adapt to many kinds of systems.
+\`configure' configures yast2-pkg-bindings 2.13.1.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1026,7 +1026,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.41:";;
+     short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.1.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1169,7 +1169,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-yast2-pkg-bindings configure 2.13.41
+yast2-pkg-bindings configure 2.13.1.7
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1183,7 +1183,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.41, which was
+It was created by yast2-pkg-bindings $as_me 2.13.1.7, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1913,7 +1913,7 @@
 
 # Define the identity of the package.
  PACKAGE='yast2-pkg-bindings'
- VERSION='2.13.41'
+ VERSION='2.13.1.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2124,7 +2124,7 @@
 
 
 
-VERSION="2.13.41"
+VERSION="2.13.1.7"
 RPMNAME="yast2-pkg-bindings"
 MAINTAINER="Michael Andres <ma@suse.de>"
 
@@ -20042,7 +20042,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by yast2-pkg-bindings $as_me 2.13.41, which was
+This file was extended by yast2-pkg-bindings $as_me 2.13.1.7, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20105,7 +20105,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-yast2-pkg-bindings config.status 2.13.41
+yast2-pkg-bindings config.status 2.13.1.7
 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.44/configure.in new/yast2-pkg-bindings-2.13.45/configure.in
--- old/yast2-pkg-bindings-2.13.44/configure.in	2006-03-27 16:16:48.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.45/configure.in	2006-02-08 17:37:32.000000000 +0100
@@ -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.41, http://www.suse.de/feedback, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.13.1.7, 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.41"
+VERSION="2.13.1.7"
 RPMNAME="yast2-pkg-bindings"
 MAINTAINER="Michael Andres <ma@suse.de>"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.44/pkg-bindings.pot new/yast2-pkg-bindings-2.13.45/pkg-bindings.pot
--- old/yast2-pkg-bindings-2.13.44/pkg-bindings.pot	2006-03-27 16:52:32.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.45/pkg-bindings.pot	1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-# 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 <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-27 16:52+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/Package.cc:1669 src/Package.cc:1729
-msgid "See /var/log/YaST2/badlist for more information."
-msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.44/src/Package.cc new/yast2-pkg-bindings-2.13.45/src/Package.cc
--- old/yast2-pkg-bindings-2.13.44/src/Package.cc	2006-04-03 08:30:52.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.45/src/Package.cc	2006-04-03 19:22:51.000000000 +0200
@@ -1937,6 +1937,66 @@
 
 
 /**
+   @builtin PkgFreshen
+   @short check all package freshens and schedule matching ones for installation
+   @return boolean
+
+   Returns true. (If no pool item 'transacts')
+
+   The pool should NOT have any items set to 'transact' (scheduled for installation
+   or removal)
+   If it has, dependencies will be solved and the returned result might be false.
+
+*/
+
+YCPBoolean
+PkgModuleFunctions::PkgFreshen()
+{
+    bool result = false;
+    
+    try
+    {
+	result = zypp_ptr()->resolver()->freshenPool();
+    }
+    catch (const zypp::Exception& excpt)
+    {
+	y2error("An error occurred during Pkg::PkgFreshen.");
+	_last_error.setLastError(excpt.asUserString(), "See /var/log/YaST2/badlist for more information.");
+    }
+
+    // save information about failed dependencies to file
+    if (!result)
+    {
+	try
+	{
+	    zypp::ResolverProblemList problems = zypp_ptr()->resolver()->problems();
+	    int problem_size = problems.size();
+
+	    if (problem_size > 0)
+	    {
+		y2error ("PkgSolve: %d packages failed (see /var/log/YaST2/badlist)", problem_size);
+
+		std::ofstream out ("/var/log/YaST2/badlist");
+
+		out << problem_size << " packages failed" << std::endl;
+		for(zypp::ResolverProblemList::const_iterator p = problems.begin();
+		     p != problems.end(); ++p )
+		{
+		    out << (*p)->description() << std::endl;
+		}
+	    }
+	}
+	catch (...)
+	{
+	    return YCPBoolean(false);
+	}
+    }
+
+    return YCPBoolean(result);
+}
+
+
+/**
    @builtin PkgSolveCheckTargetOnly
 
    @short Solve packages currently installed on target system.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.44/src/PkgModuleFunctions.h new/yast2-pkg-bindings-2.13.45/src/PkgModuleFunctions.h
--- old/yast2-pkg-bindings-2.13.44/src/PkgModuleFunctions.h	2006-04-03 11:15:15.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.45/src/PkgModuleFunctions.h	2006-04-03 19:24:23.000000000 +0200
@@ -375,6 +375,8 @@
 	/* TYPEINFO: boolean()*/
 	YCPBoolean PkgEstablish ();
 	/* TYPEINFO: boolean()*/
+	YCPBoolean PkgFreshen ();
+	/* TYPEINFO: boolean()*/
 	YCPBoolean PkgSolveCheckTargetOnly ();
 	/* TYPEINFO: integer()*/
 	YCPValue PkgSolveErrors ();


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



Remember to have fun...

    

root＠suse.de

tags

participants (1)