commit yast2-pkg-bindings

19 May 2006

Hello community,

here is the log from the commit of package yast2-pkg-bindings
checked in at Fri May 19 17:01:35 CEST 2006.

--------

--- yast2-pkg-bindings/yast2-pkg-bindings.changes	2006-05-18 16:50:44.000000000 +0200
+++ yast2-pkg-bindings/yast2-pkg-bindings.changes	2006-05-19 10:06:23.000000000 +0200
@@ -2 +2,9 @@
-Thu May 18 16:49:53 CEST 2006 - hh@suse.cz
+Fri May 19 09:49:38 CEST 2006 - lslezak@suse.cz
+
+- ignore installed selections in Pkg::GetSelections() when asking
+  for available selections (#170537), the same fix has been
+  implemented also in Pkg::GetPatterns()
+- 2.13.77
+
+-------------------------------------------------------------------
+Thu May 18 16:49:53 CEST 2006 - mvidner@suse.cz
@@ -27 +34,0 @@
->>>>>>> .r30956

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

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

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

Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.O4rW3e/_old	2006-05-19 16:58:05.000000000 +0200
+++ /var/tmp/diff_new_pack.O4rW3e/_new	2006-05-19 16:58:05.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-pkg-bindings (Version 2.13.76)
+# spec file for package yast2-pkg-bindings (Version 2.13.77)
 #
 # 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.76
+Version:        2.13.77
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-pkg-bindings-2.13.76.tar.bz2
+Source0:        yast2-pkg-bindings-2.13.77.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.76
+%setup -n yast2-pkg-bindings-2.13.77
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -67,7 +67,12 @@
 %doc %{prefix}/share/doc/packages/yast2-pkg-bindings
 
 %changelog -n yast2-pkg-bindings
-* Thu May 18 2006 - hh@suse.cz
+* Fri May 19 2006 - lslezak@suse.cz
+- ignore installed selections in Pkg::GetSelections() when asking
+  for available selections (#170537), the same fix has been
+  implemented also in Pkg::GetPatterns()
+- 2.13.77
+* Thu May 18 2006 - mvidner@suse.cz
 - Say also the URL of a failed source in SourceStartManager (#175153).
 - 2.13.76
 * Wed May 17 2006 - jsrain@suse.cz
@@ -80,7 +85,6 @@
   has not seen any resolvables yet. Fixes deleting corrupt sources
   (#174840).
 - 2.13.74
-  >>>>>>> .r30956
 * Tue May 16 2006 - jsrain@suse.cz
 - fixed resetting resolvable status (#175711, #175451)
 - 2.13.73

++++++ yast2-pkg-bindings-2.13.76.tar.bz2 -> yast2-pkg-bindings-2.13.77.tar.bz2 ++++++
++++   14116 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.13.76/VERSION new/yast2-pkg-bindings-2.13.77/VERSION
--- old/yast2-pkg-bindings-2.13.76/VERSION	2006-05-18 16:50:25.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.77/VERSION	2006-05-19 09:50:04.000000000 +0200
@@ -1 +1 @@
-2.13.76
+2.13.77
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.13.76/configure.in new/yast2-pkg-bindings-2.13.77/configure.in
--- old/yast2-pkg-bindings-2.13.76/configure.in	2006-05-18 16:51:37.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.77/configure.in	2006-05-19 10:02:47.000000000 +0200
@@ -1,9 +1,9 @@
 dnl configure.in for yast2-pkg-bindings
 dnl
-dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! --
+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.76, http://bugs.opensuse.org/, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.13.77, 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.76"
+VERSION="2.13.77"
 RPMNAME="yast2-pkg-bindings"
 MAINTAINER="Michael Andres <ma@suse.de>"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.13.76/src/Selection.cc new/yast2-pkg-bindings-2.13.77/src/Selection.cc
--- old/yast2-pkg-bindings-2.13.76/src/Selection.cc	2006-03-29 14:36:04.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.77/src/Selection.cc	2006-05-16 16:31:25.000000000 +0200
@@ -93,10 +93,18 @@
 	{
 	    string selection;
 
-	    if (status == "all" || status == "available")
+	    if (status == "all")
 	    {
 		selection = it->resolvable()->name();
 	    }
+	    else if (status == "available")
+	    {
+		// ignore installed selections
+		zypp::Source_Ref src = (*it)->source();
+
+		if (src != zypp::Source_Ref::noSource)
+		    selection = it->resolvable()->name();
+	    }
 	    else if (status == "selected")
 	    {
 		if( it->status().isToBeInstalled() )
@@ -186,10 +194,18 @@
 	{
 	    std::string pattern;
 
-	    if (status == "all" || status == "available")
+	    if (status == "all")
 	    {
 		pattern = it->resolvable()->name();
 	    }
+	    else if (status == "available")
+	    {
+		// ignore installed patterns
+		zypp::Source_Ref src = (*it)->source();
+
+		if (src != zypp::Source_Ref::noSource)
+		    pattern = it->resolvable()->name();
+	    }
 	    else if (status == "selected")
 	    {
 		if( it->status().isToBeInstalled() )


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



Remember to have fun...

    

root＠suse.de

tags

participants (1)