Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit yast2-pkg-bindings
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Fri, 24 Aug 2007 22:43:47 +0200
  • Message-id: <20070824204347.7C017678331@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-pkg-bindings
checked in at Fri Aug 24 22:43:47 CEST 2007.

--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes       2007-08-20 17:46:58.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes  2007-08-24 13:51:01.881281000 +0200
@@ -1,0 +2,9 @@
+Thu Aug 23 14:03:19 CEST 2007 - lslezak@xxxxxxx
+
+- Pkg::SourceLoad() - load resolvables from all working
+  repositories even when some of them fails (#302432)
+- Pkg::PkgMediaNames() - return repository names instead of
+  product names (#304152)
+- 2.15.45
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-pkg-bindings-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.N20670/_old  2007-08-24 22:42:13.000000000 +0200
+++ /var/tmp/diff_new_pack.N20670/_new  2007-08-24 22:42:13.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-pkg-bindings-devel-doc (Version 2.15.44)
+# spec file for package yast2-pkg-bindings-devel-doc (Version 2.15.45)
 #
 # Copyright (c) 2007 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-devel-doc
-Version:        2.15.44
+Version:        2.15.45
 Release:        1
 License:        GPL v2 or later
 Group:          Documentation/HTML
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-pkg-bindings-2.15.44.tar.bz2
+Source0:        yast2-pkg-bindings-2.15.45.tar.bz2
 prefix:                /usr
 # same as in the main package (because we use the same configure.in.in)
 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
@@ -37,7 +37,7 @@
     Ladislav SlezŠk <lslezak@xxxxxxxxxx>
 
 %prep
-%setup -n yast2-pkg-bindings-2.15.44
+%setup -n yast2-pkg-bindings-2.15.45
 # build only documentation, ignore all other directories
 echo "doc" > SUBDIRS
 

++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.N20670/_old  2007-08-24 22:42:13.000000000 +0200
+++ /var/tmp/diff_new_pack.N20670/_new  2007-08-24 22:42:13.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-pkg-bindings (Version 2.15.44)
+# spec file for package yast2-pkg-bindings (Version 2.15.45)
 #
 # Copyright (c) 2007 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.15.44
+Version:        2.15.45
 Release:        1
 License:        GPL v2 or later
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-pkg-bindings-2.15.44.tar.bz2
+Source0:        yast2-pkg-bindings-2.15.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 perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools
 BuildRequires:  libzypp-devel >= 3.13.11
@@ -40,7 +40,7 @@
     Stanislav Visnovsky <visnov@xxxxxxx>
 
 %prep
-%setup -n yast2-pkg-bindings-2.15.44
+%setup -n yast2-pkg-bindings-2.15.45
 # build only the library, ignore documentation (it is in devel-doc package)
 echo "src" > SUBDIRS
 
@@ -73,6 +73,12 @@
 %doc %{prefix}/share/doc/packages/yast2-pkg-bindings
 
 %changelog
+* Thu Aug 23 2007 - lslezak@xxxxxxx
+- Pkg::SourceLoad() - load resolvables from all working
+  repositories even when some of them fails (#302432)
+- Pkg::PkgMediaNames() - return repository names instead of
+  product names (#304152)
+- 2.15.45
 * Mon Aug 20 2007 - lslezak@xxxxxxx
 - Pkg::SourceLoad() (and related) - do not refresh already loaded
   repositories (#300891)

++++++ yast2-pkg-bindings-2.15.44.tar.bz2 -> yast2-pkg-bindings-2.15.45.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.44/configure new/yast2-pkg-bindings-2.15.45/configure
--- old/yast2-pkg-bindings-2.15.44/configure    2007-08-20 17:37:15.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.45/configure    2007-08-24 13:49:24.000000000 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.15.44.
+# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.15.45.
 #
 # Report bugs to <http://bugs.opensuse.org/>.
 #
@@ -713,8 +713,8 @@
 # Identity of this package.
 PACKAGE_NAME='yast2-pkg-bindings'
 PACKAGE_TARNAME='yast2-pkg-bindings'
-PACKAGE_VERSION='2.15.44'
-PACKAGE_STRING='yast2-pkg-bindings 2.15.44'
+PACKAGE_VERSION='2.15.45'
+PACKAGE_STRING='yast2-pkg-bindings 2.15.45'
 PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
 
 ac_unique_file="RPMNAME"
@@ -1429,7 +1429,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.15.44 to adapt to many kinds of systems.
+\`configure' configures yast2-pkg-bindings 2.15.45 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1500,7 +1500,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of yast2-pkg-bindings 2.15.44:";;
+     short | recursive ) echo "Configuration of yast2-pkg-bindings 2.15.45:";;
    esac
   cat <<\_ACEOF
 
@@ -1608,7 +1608,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-yast2-pkg-bindings configure 2.15.44
+yast2-pkg-bindings configure 2.15.45
 generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1622,7 +1622,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.15.44, which was
+It was created by yast2-pkg-bindings $as_me 2.15.45, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
@@ -2423,7 +2423,7 @@
 
 # Define the identity of the package.
  PACKAGE='yast2-pkg-bindings'
- VERSION='2.15.44'
+ VERSION='2.15.45'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2650,7 +2650,7 @@
 
 
 
-VERSION="2.15.44"
+VERSION="2.15.45"
 RPMNAME="yast2-pkg-bindings"
 MAINTAINER="Ladislav Slez√°k <lslezak@xxxxxxx>"
 
@@ -21612,7 +21612,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by yast2-pkg-bindings $as_me 2.15.44, which was
+This file was extended by yast2-pkg-bindings $as_me 2.15.45, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21665,7 +21665,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-yast2-pkg-bindings config.status 2.15.44
+yast2-pkg-bindings config.status 2.15.45
 configured by $0, generated by GNU Autoconf 2.60,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.44/configure.in new/yast2-pkg-bindings-2.15.45/configure.in
--- old/yast2-pkg-bindings-2.15.44/configure.in 2007-08-20 17:37:01.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.45/configure.in 2007-08-24 13:49:11.000000000 +0200
@@ -3,7 +3,7 @@
 dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-pkg-bindings, 2.15.44, http://bugs.opensuse.org/, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.15.45, 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.15.44"
+VERSION="2.15.45"
 RPMNAME="yast2-pkg-bindings"
 MAINTAINER="Ladislav Slez√°k <lslezak@xxxxxxx>"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.44/src/Package.cc new/yast2-pkg-bindings-2.15.45/src/Package.cc
--- old/yast2-pkg-bindings-2.15.44/src/Package.cc       2007-08-15 13:31:39.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.45/src/Package.cc       2007-08-23 16:02:07.000000000 +0200
@@ -202,42 +202,12 @@
        {
            try
            {
-               // find a product for the given source
-               zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResTraits<zypp::Product>::kind);
+               std::string repo_name = (*repoit)->repoInfo().name();
+               YCPList src_desc;
 
-               for( ; it != zypp_ptr()->pool().byKindEnd(zypp::ResTraits<zypp::Product>::kind)
-                   ; ++it) {
-                   zypp::Product::constPtr product = boost::dynamic_pointer_cast<const zypp::Product>( it->resolvable() );
-
-                   y2debug ("Checking product: %s", product->summary().c_str());
-                   if( product->repository().info().alias() == (*repoit)->repoInfo().alias())
-                   {
-                       y2debug ("Found");
-
-                       YCPList src_desc;
-
-                       // use name if the summary is empty
-                       std::string product_name = product->summary();
-                       if (product_name.empty())
-                       {
-                           product_name = product->name();
-                       }
-
-                       src_desc->add( YCPString( product_name ) );
-                       src_desc->add( YCPInteger( index ) );
-
-                       res->add( src_desc );
-                       break;
-                   }
-               }
-
-               // the product hasn't been found, resolvables are probably not loaded
-               // use URL as the product name in such case
-               if( it == zypp_ptr()->pool().byKindEnd(zypp::ResTraits<zypp::Product>::kind) )
+               if (repo_name.empty())
                {
-                   y2warning("Product for source '%d' not found", index);
-
-                   YCPList src_desc;
+                   y2warning("Name of repository '%d' is empty, using URL", index);
 
                    // use URL as the product name
                    std::string name;
@@ -257,6 +227,13 @@
 
                    res->add( src_desc );
                }
+               else
+               {
+                   src_desc->add( YCPString( repo_name ));
+                   src_desc->add( YCPInteger( index ) );
+
+                   res->add( src_desc );
+               }
            }
            catch (...)
            {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.44/src/Source.cc new/yast2-pkg-bindings-2.15.45/src/Source.cc
--- old/yast2-pkg-bindings-2.15.44/src/Source.cc        2007-08-20 17:08:31.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.45/src/Source.cc        2007-08-23 13:53:23.000000000 +0200
@@ -433,7 +433,7 @@
                }
 
                // load objects
-               success = success && LoadResolvablesFrom((*it)->repoInfo());
+               success = LoadResolvablesFrom((*it)->repoInfo()) && success;
            }
        }
     }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.44/VERSION new/yast2-pkg-bindings-2.15.45/VERSION
--- old/yast2-pkg-bindings-2.15.44/VERSION      2007-08-20 17:27:17.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.45/VERSION      2007-08-23 13:53:35.000000000 +0200
@@ -1 +1 @@
-2.15.44
+2.15.45


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



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >