commit yast2-pkg-bindings

22 May 2006

Hello community,

here is the log from the commit of package yast2-pkg-bindings
checked in at Tue May 23 01:39:12 CEST 2006.

--------

--- yast2-pkg-bindings/yast2-pkg-bindings.changes	2006-05-19 10:06:23.000000000 +0200
+++ yast2-pkg-bindings/yast2-pkg-bindings.changes	2006-05-22 15:51:46.000000000 +0200
@@ -1,0 +2,13 @@
+Mon May 22 13:23:48 CEST 2006 - lslezak@suse.cz
+
+- Pkg::DoProvide - select only the newest item for installation,
+  remove the flag from other versions (#176854)
+- 2.13.79
+
+-------------------------------------------------------------------
+Mon May 22 10:51:44 CEST 2006 - jsrain@suse.cz
+
+- added PkgApplReset builtin (#176788)
+- 2.13.78
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.WGPbxe/_old	2006-05-23 01:39:06.000000000 +0200
+++ /var/tmp/diff_new_pack.WGPbxe/_new	2006-05-23 01:39:06.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-pkg-bindings (Version 2.13.77)
+# spec file for package yast2-pkg-bindings (Version 2.13.79)
 #
 # 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.77
+Version:        2.13.79
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-pkg-bindings-2.13.77.tar.bz2
+Source0:        yast2-pkg-bindings-2.13.79.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.77
+%setup -n yast2-pkg-bindings-2.13.79
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -67,6 +67,13 @@
 %doc %{prefix}/share/doc/packages/yast2-pkg-bindings
 
 %changelog -n yast2-pkg-bindings
+* Mon May 22 2006 - lslezak@suse.cz
+- Pkg::DoProvide - select only the newest item for installation,
+  remove the flag from other versions (#176854)
+- 2.13.79
+* Mon May 22 2006 - jsrain@suse.cz
+- added PkgApplReset builtin (#176788)
+- 2.13.78
 * Fri May 19 2006 - lslezak@suse.cz
 - ignore installed selections in Pkg::GetSelections() when asking
   for available selections (#170537), the same fix has been

++++++ yast2-pkg-bindings-2.13.77.tar.bz2 -> yast2-pkg-bindings-2.13.79.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.77/VERSION new/yast2-pkg-bindings-2.13.79/VERSION
--- old/yast2-pkg-bindings-2.13.77/VERSION	2006-05-19 09:50:04.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.79/VERSION	2006-05-22 13:23:43.000000000 +0200
@@ -1 +1 @@
-2.13.77
+2.13.79
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.77/configure new/yast2-pkg-bindings-2.13.79/configure
--- old/yast2-pkg-bindings-2.13.77/configure	2006-05-19 10:03:14.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.79/configure	2006-05-22 15:44:16.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.77.
+# Generated by GNU Autoconf 2.59 for yast2-pkg-bindings 2.13.79.
 #
 # Report bugs to <http://bugs.opensuse.org/>.
 #
@@ -423,8 +423,8 @@
 # Identity of this package.
 PACKAGE_NAME='yast2-pkg-bindings'
 PACKAGE_TARNAME='yast2-pkg-bindings'
-PACKAGE_VERSION='2.13.77'
-PACKAGE_STRING='yast2-pkg-bindings 2.13.77'
+PACKAGE_VERSION='2.13.79'
+PACKAGE_STRING='yast2-pkg-bindings 2.13.79'
 PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
 
 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.77 to adapt to many kinds of systems.
+\`configure' configures yast2-pkg-bindings 2.13.79 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.77:";;
+     short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.79:";;
    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.77
+yast2-pkg-bindings configure 2.13.79
 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.77, which was
+It was created by yast2-pkg-bindings $as_me 2.13.79, 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.77'
+ VERSION='2.13.79'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2139,7 +2139,7 @@
 
 
 
-VERSION="2.13.77"
+VERSION="2.13.79"
 RPMNAME="yast2-pkg-bindings"
 MAINTAINER="Michael Andres <ma@suse.de>"
 
@@ -20273,7 +20273,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by yast2-pkg-bindings $as_me 2.13.77, which was
+This file was extended by yast2-pkg-bindings $as_me 2.13.79, 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.77
+yast2-pkg-bindings config.status 2.13.79
 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.77/configure.in new/yast2-pkg-bindings-2.13.79/configure.in
--- old/yast2-pkg-bindings-2.13.77/configure.in	2006-05-19 10:02:47.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.79/configure.in	2006-05-22 15:43:51.000000000 +0200
@@ -3,7 +3,7 @@
 dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-pkg-bindings, 2.13.77, http://bugs.opensuse.org/, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.13.79, 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.13.77"
+VERSION="2.13.79"
 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.77/src/Package.cc new/yast2-pkg-bindings-2.13.79/src/Package.cc
--- old/yast2-pkg-bindings-2.13.77/src/Package.cc	2006-05-17 09:01:42.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.79/src/Package.cc	2006-05-22 13:23:26.000000000 +0200
@@ -539,9 +539,10 @@
 {
     zypp::PoolItem_Ref item;
     zypp::Arch _architecture;
+    zypp::ResStatus::TransactByValue whoWantsIt;
 
     ProvideProcess( zypp::Arch arch )
-	: _architecture( arch )
+	: _architecture( arch ), whoWantsIt(zypp::ResStatus::APPL_HIGH)
     { }
 
     bool operator()( zypp::PoolItem provider )
@@ -553,6 +554,13 @@
 
 	if (!provider.status().isInstalled())
 	{
+	    // deselect the item if it's already selected,
+	    // only one item should be selected
+	    if (provider.status().isToBeInstalled())
+	    {
+		provider.status().resetTransact(whoWantsIt);
+	    }
+
 	    // regarding items which are installable only
 	    if (!provider->arch().compatibleWith( _architecture )) {
 		y2milestone ("provider %s has incompatible arch '%s'", provider->name().c_str(), provider->arch().asString().c_str());
@@ -584,6 +592,7 @@
     try
     {
 	ProvideProcess info( zypp_ptr()->architecture() );
+	info.whoWantsIt = whoWantsIt;
 
 	invokeOnEach( zypp_ptr()->pool().byNameBegin( name ),
 		      zypp_ptr()->pool().byNameEnd( name ),
@@ -1804,7 +1813,6 @@
  * @builtin Reset
  *
  * @short Reset most internal stuff on the package manager.
-   @param string package
    @return boolean
  */
 
@@ -1834,6 +1842,37 @@
 
 
 /**
+ * @builtin Reset
+ *
+ * @short Reset most internal stuff on the package manager.
+   Reset only packages set by the application, not by the user
+   @return boolean
+ */
+
+YCPValue
+PkgModuleFunctions::PkgApplReset ()
+{
+    try
+    {
+	for (zypp::ResPool::const_iterator it = zypp_ptr()->pool().begin()
+	    ; it != zypp_ptr()->pool().end()
+	    ; ++it)
+	{
+	    // reset all transaction flags
+	    it->status().resetTransact(zypp::ResStatus::APPL_HIGH);
+	}
+
+	return YCPBoolean (true);
+    }
+    catch (...)
+    {
+    }
+
+    return YCPBoolean (false);
+}
+
+
+/**
    @builtin PkgSolve
    @short Solve current package dependencies
    @optarg booean filter  filter all conflicts with installed packages
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.77/src/PkgModuleFunctions.h new/yast2-pkg-bindings-2.13.79/src/PkgModuleFunctions.h
--- old/yast2-pkg-bindings-2.13.77/src/PkgModuleFunctions.h	2006-05-19 09:46:48.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.79/src/PkgModuleFunctions.h	2006-05-22 13:23:26.000000000 +0200
@@ -391,6 +391,8 @@
 	YCPValue PkgNeutral (const YCPString& p);
 	/* TYPEINFO: boolean()*/
 	YCPValue PkgReset ();
+	/* TYPEINFO: boolean()*/
+	YCPValue PkgApplReset ();
 	/* TYPEINFO: boolean(boolean)*/
 	YCPBoolean PkgSolve (const YCPBoolean& filter);
 	/* TYPEINFO: boolean()*/


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



Remember to have fun...

    

root＠suse.de

tags

participants (1)