Hello community, here is the log from the commit of package yast2-pkg-bindings checked in at Mon Sep 24 19:02:05 CEST 2007. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2007-09-03 13:05:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2007-09-24 17:47:07.592259000 +0200 @@ -1,0 +2,16 @@ +Mon Sep 24 17:43:01 CEST 2007 - lslezak@suse.cz + +- set path to metadata files when registering a new repository, + required to set the media verifier correctly (#293428) +- 2.15.51 + +------------------------------------------------------------------- +Mon Sep 24 09:02:57 CEST 2007 - lslezak@suse.cz + +- search the correct package instance in license bindings + (Pkg::PkgGetLicenseToConfirm(), Pkg::PkgGetLicensesToConfirm() + and Pkg::PkgMarkLicenseConfirmed()) - fixes the double license + confirmation bug (#326277) +- 2.15.50 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-2.15.49.tar.bz2 New: ---- yast2-pkg-bindings-2.15.51.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.mt9520/_old 2007-09-24 19:01:49.000000000 +0200 +++ /var/tmp/diff_new_pack.mt9520/_new 2007-09-24 19:01:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings-devel-doc (Version 2.15.49) +# spec file for package yast2-pkg-bindings-devel-doc (Version 2.15.51) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,16 +11,16 @@ # norootforbuild Name: yast2-pkg-bindings-devel-doc -Version: 2.15.49 +Version: 2.15.51 Release: 1 License: GPL v2 or later Group: Documentation/HTML BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.15.49.tar.bz2 -prefix: /usr +Source0: yast2-pkg-bindings-2.15.51.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 -Buildarch: noarch +BuildArch: noarch Requires: yast2-pkg-bindings = %{version} Summary: YaST2 - Documentation for yast2-pkg-bindings package Group: Documentation/HTML @@ -37,7 +37,7 @@ Ladislav Slez�k <lslezak@novell.com> %prep -%setup -n yast2-pkg-bindings-2.15.49 +%setup -n yast2-pkg-bindings-2.15.51 # build only documentation, ignore all other directories echo "doc" > SUBDIRS @@ -69,7 +69,6 @@ %exclude %{prefix}/share/doc/packages/yast2-pkg-bindings/COPYING %exclude %{prefix}/share/doc/packages/yast2-pkg-bindings/COPYRIGHT.english %exclude %{prefix}/share/doc/packages/yast2-pkg-bindings/README - %changelog * Thu Jul 26 2007 - lslezak@suse.cz - Initial version ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.mt9520/_old 2007-09-24 19:01:49.000000000 +0200 +++ /var/tmp/diff_new_pack.mt9520/_new 2007-09-24 19:01:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings (Version 2.15.49) +# spec file for package yast2-pkg-bindings (Version 2.15.51) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,18 +11,18 @@ # norootforbuild Name: yast2-pkg-bindings -Version: 2.15.49 +Version: 2.15.51 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.15.49.tar.bz2 -prefix: /usr +Source0: yast2-pkg-bindings-2.15.51.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.21.0 -BuildRequires: libzypp >= 3.21.0 -# changed requestMedia callback -Requires: libzypp >= 3.21.0 +BuildRequires: libzypp-devel >= 3.25.0 +BuildRequires: libzypp >= 3.25.0 +# RepoManager::metadataPath() +Requires: libzypp >= 3.25.0 Summary: YaST2 - Package Manager Access %description @@ -40,7 +40,7 @@ Stanislav Visnovsky <visnov@suse.cz> %prep -%setup -n yast2-pkg-bindings-2.15.49 +%setup -n yast2-pkg-bindings-2.15.51 # build only the library, ignore documentation (it is in devel-doc package) echo "src" > SUBDIRS @@ -71,8 +71,17 @@ %{_libdir}/YaST2/plugin/libpy2Pkg.so.* %{_libdir}/YaST2/plugin/libpy2Pkg.so %doc %{prefix}/share/doc/packages/yast2-pkg-bindings - %changelog +* Mon Sep 24 2007 - lslezak@suse.cz +- set path to metadata files when registering a new repository, + required to set the media verifier correctly (#293428) +- 2.15.51 +* Mon Sep 24 2007 - lslezak@suse.cz +- search the correct package instance in license bindings + (Pkg::PkgGetLicenseToConfirm(), Pkg::PkgGetLicensesToConfirm() + and Pkg::PkgMarkLicenseConfirmed()) - fixes the double license + confirmation bug (#326277) +- 2.15.50 * Mon Sep 03 2007 - lslezak@suse.cz - reimplemented media redirection in media change callback (#294481) ++++++ yast2-pkg-bindings-2.15.49.tar.bz2 -> yast2-pkg-bindings-2.15.51.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.49/configure new/yast2-pkg-bindings-2.15.51/configure --- old/yast2-pkg-bindings-2.15.49/configure 2007-09-03 13:04:38.000000000 +0200 +++ new/yast2-pkg-bindings-2.15.51/configure 2007-09-24 16:52:40.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-pkg-bindings 2.15.49. +# Generated by GNU Autoconf 2.61 for yast2-pkg-bindings 2.15.51. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='yast2-pkg-bindings' PACKAGE_TARNAME='yast2-pkg-bindings' -PACKAGE_VERSION='2.15.49' -PACKAGE_STRING='yast2-pkg-bindings 2.15.49' +PACKAGE_VERSION='2.15.51' +PACKAGE_STRING='yast2-pkg-bindings 2.15.51' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1447,7 +1447,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.49 to adapt to many kinds of systems. +\`configure' configures yast2-pkg-bindings 2.15.51 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1518,7 +1518,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-pkg-bindings 2.15.49:";; + short | recursive ) echo "Configuration of yast2-pkg-bindings 2.15.51:";; esac cat <<\_ACEOF @@ -1627,7 +1627,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-pkg-bindings configure 2.15.49 +yast2-pkg-bindings configure 2.15.51 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1641,7 +1641,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.49, which was +It was created by yast2-pkg-bindings $as_me 2.15.51, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2462,7 +2462,7 @@ # Define the identity of the package. PACKAGE='yast2-pkg-bindings' - VERSION='2.15.49' + VERSION='2.15.51' cat >>confdefs.h <<_ACEOF @@ -2689,7 +2689,7 @@ -VERSION="2.15.49" +VERSION="2.15.51" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak@suse.cz>" @@ -21198,7 +21198,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.49, which was +This file was extended by yast2-pkg-bindings $as_me 2.15.51, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21251,7 +21251,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-pkg-bindings config.status 2.15.49 +yast2-pkg-bindings config.status 2.15.51 configured by $0, generated by GNU Autoconf 2.61, 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.49/configure.in new/yast2-pkg-bindings-2.15.51/configure.in --- old/yast2-pkg-bindings-2.15.49/configure.in 2007-09-03 13:04:24.000000000 +0200 +++ new/yast2-pkg-bindings-2.15.51/configure.in 2007-09-24 16:52:25.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-pkg-bindings dnl -dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-pkg-bindings, 2.15.49, http://bugs.opensuse.org/, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 2.15.51, 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.49" +VERSION="2.15.51" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.49/Makefile.am new/yast2-pkg-bindings-2.15.51/Makefile.am --- old/yast2-pkg-bindings-2.15.49/Makefile.am 2007-09-03 13:04:24.000000000 +0200 +++ new/yast2-pkg-bindings-2.15.51/Makefile.am 2007-09-24 16:52:25.000000000 +0200 @@ -30,7 +30,7 @@ extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) -AUTOMAKE_OPTIONS = foreign dist-bzip2 +AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.49/Makefile.in new/yast2-pkg-bindings-2.15.51/Makefile.in --- old/yast2-pkg-bindings-2.15.49/Makefile.in 2007-09-03 13:04:42.000000000 +0200 +++ new/yast2-pkg-bindings-2.15.51/Makefile.in 2007-09-24 16:52:44.000000000 +0200 @@ -88,8 +88,8 @@ { test ! -d $(distdir) \ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best +DIST_ARCHIVES = $(distdir).tar.bz2 distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ @@ -260,7 +260,7 @@ COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) -AUTOMAKE_OPTIONS = foreign dist-bzip2 +AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal @@ -582,7 +582,6 @@ $(am__remove_distdir) dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.49/src/Package.cc new/yast2-pkg-bindings-2.15.51/src/Package.cc --- old/yast2-pkg-bindings-2.15.49/src/Package.cc 2007-08-31 10:25:26.000000000 +0200 +++ new/yast2-pkg-bindings-2.15.51/src/Package.cc 2007-09-21 13:57:31.000000000 +0200 @@ -2419,23 +2419,21 @@ { try { - // find the uninstalled (!) package - zypp::ResPool::byName_iterator it = std::find_if ( - zypp_ptr()->pool().byNameBegin(pkgname) - , zypp_ptr()->pool().byNameEnd(pkgname) - , zypp::functor::chain( - zypp::resfilter::ByUninstalled (), - zypp::resfilter::ByKind( zypp::ResTraits<zypp::Package>::kind ) ) - ); - - if (it != zypp_ptr()->pool().byNameEnd(pkgname) && !it->status().isLicenceConfirmed()) + for (zypp::ResPool::byName_iterator it = zypp_ptr()->pool().byNameBegin(pkgname); + it != zypp_ptr()->pool().byNameEnd(pkgname); + ++it) { - // cast to Package object + // is it a package? zypp::Package::constPtr package = zypp::dynamic_pointer_cast<const zypp::Package>(it->resolvable()); - // get the license - zypp::License license = package->licenseToConfirm(); - return YCPString(license); + // a package scheduled for installation, with unconfirmed license, not installed yet + if (package && it->status().isToBeInstalled() && !it->status().isLicenceConfirmed() + && !it->status().isInstalled()) + { + // get the license + zypp::License license = package->licenseToConfirm(); + return YCPString(license); + } } } catch (...) @@ -2462,38 +2460,12 @@ YCPMap ret; for ( int i = 0; i < packages->size(); ++i ) { - std::string pkgname = packages->value(i)->asString()->value(); + YCPString license = PkgGetLicenseToConfirm(packages->value(i)->asString()); - if (!pkgname.empty()) + // found a license to confirm? + if (!license->value().empty()) { - try - { - // find the uninstalled (!) package - zypp::ResPool::byName_iterator it = std::find_if( - zypp_ptr()->pool().byNameBegin(pkgname) - , zypp_ptr()->pool().byNameEnd(pkgname) - , zypp::functor::chain( - zypp::resfilter::ByUninstalled (), - zypp::resfilter::ByKind( zypp::ResTraits<zypp::Package>::kind ) ) - ); - - // found a package? - if (it != zypp_ptr()->pool().byNameEnd(pkgname)) - { - // cast to Package object - zypp::Package::constPtr package = zypp::dynamic_pointer_cast<const zypp::Package>(it->resolvable()); - zypp::License license = package->licenseToConfirm(); - - // has the license already been confirmed? - if (!license.empty() && !it->status().isLicenceConfirmed()) - { - ret->add(packages->value(i), YCPString(license)); - } - } - } - catch (...) - { - } + ret->add(packages->value(i), license); } } @@ -2507,7 +2479,6 @@ @param string name of a package @return boolean true if the license has been successfuly confirmed */ -#warning This is bogus, as we have multiple matching packages YCPBoolean PkgModuleFunctions::PkgMarkLicenseConfirmed (const YCPString & package) { std::string pkgname = package->value(); @@ -2516,20 +2487,21 @@ { try { - // find the package - zypp::ResPool::byName_iterator it = std::find_if( - zypp_ptr()->pool().byNameBegin(pkgname) - , zypp_ptr()->pool().byNameEnd(pkgname) - , zypp::functor::chain( - zypp::resfilter::ByUninstalled (), - zypp::resfilter::ByKind( zypp::ResTraits<zypp::Package>::kind ) ) - ); - - if (it != zypp_ptr()->pool().byNameEnd(pkgname)) + for (zypp::ResPool::byName_iterator it = zypp_ptr()->pool().byNameBegin(pkgname); + it != zypp_ptr()->pool().byNameEnd(pkgname); + ++it) { - // confirm the license - it->status().setLicenceConfirmed(true); - return YCPBoolean( true ); + // is it a package? + zypp::Package::constPtr package = zypp::dynamic_pointer_cast<const zypp::Package>(it->resolvable()); + + // a package scheduled for installation, with unconfirmed license, not installed yet + if (package && it->status().isToBeInstalled() && !it->status().isLicenceConfirmed() + && !it->status().isInstalled()) + { + // confirm the license + it->status().setLicenceConfirmed(true); + return YCPBoolean( true ); + } } } catch (...) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.49/src/Source.cc new/yast2-pkg-bindings-2.15.51/src/Source.cc --- old/yast2-pkg-bindings-2.15.49/src/Source.cc 2007-08-30 15:55:51.000000000 +0200 +++ new/yast2-pkg-bindings-2.15.51/src/Source.cc 2007-09-24 16:51:54.000000000 +0200 @@ -1587,6 +1587,10 @@ repo.setEnabled(true); repo.setAutorefresh(autorefresh); + // set metadata path (#293428) + zypp::Pathname metadatapath = repomanager.metadataPath(repo); + repo.setMetadataPath(metadatapath); + y2milestone("Adding source '%s' (%s)", repo.alias().c_str(), url.asString().c_str()); // note: exceptions should be caught by the calling code RefreshWithCallbacks(repo); @@ -1760,6 +1764,11 @@ repo.setPath(params->value(YCPString("prod_dir"))->asString()->value()); } + // set metadata path (#293428) + zypp::RepoManager repomanager = CreateRepoManager(); + zypp::Pathname metadatapath = repomanager.metadataPath(repo); + repo.setMetadataPath(metadatapath); + repos.push_back(new YRepo(repo)); // the new source is at the end of the list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.49/VERSION new/yast2-pkg-bindings-2.15.51/VERSION --- old/yast2-pkg-bindings-2.15.49/VERSION 2007-09-03 13:01:01.000000000 +0200 +++ new/yast2-pkg-bindings-2.15.51/VERSION 2007-09-24 16:52:22.000000000 +0200 @@ -1 +1 @@ -2.15.49 +2.15.51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org