Hello community, here is the log from the commit of package yast2-pkg-bindings for openSUSE:Factory checked in at Sat Apr 24 11:45:07 CEST 2010. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2010-01-06 20:14:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2010-04-21 21:17:21.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Apr 21 17:22:31 UTC 2010 - lslezak@suse.cz + +- reload services rnd epositories after service refresh to avoid + overwriting the updated files (bnc#581766) +- 2.19.1 + +------------------------------------------------------------------- +Mon Jan 18 14:40:21 UTC 2010 - lslezak@suse.cz + +- Pkg::ResolvableProperties() - return 'product' value from + <upgrade> section (bnc#571621) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-pkg-bindings-2.19.0.tar.bz2 New: ---- yast2-pkg-bindings-2.19.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.z2eyo4/_old 2010-04-24 11:45:03.000000000 +0200 +++ /var/tmp/diff_new_pack.z2eyo4/_new 2010-04-24 11:45:03.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings-devel-doc (Version 2.19.0) +# spec file for package yast2-pkg-bindings-devel-doc (Version 2.19.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,15 +19,18 @@ Name: yast2-pkg-bindings-devel-doc -Version: 2.19.0 + +Version: 2.19.1 Release: 1 License: GPL Group: Documentation/HTML BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.19.0.tar.bz2 +Source0: yast2-pkg-bindings-2.19.1.tar.bz2 Prefix: %_prefix + # same as in the main package (because we use the same configure.in.in) BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools + BuildArch: noarch Requires: yast2-pkg-bindings = %{version} Summary: YaST2 - Documentation for yast2-pkg-bindings package @@ -39,7 +42,7 @@ from the pkg-bindings sources. %prep -%setup -n yast2-pkg-bindings-2.19.0 +%setup -n yast2-pkg-bindings-2.19.1 # build only documentation, ignore all other directories echo "doc" > SUBDIRS @@ -47,8 +50,10 @@ %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.z2eyo4/_old 2010-04-24 11:45:03.000000000 +0200 +++ /var/tmp/diff_new_pack.z2eyo4/_new 2010-04-24 11:45:03.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings (Version 2.19.0) +# spec file for package yast2-pkg-bindings (Version 2.19.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,17 +19,22 @@ Name: yast2-pkg-bindings -Version: 2.19.0 +Version: 2.19.1 Release: 1 + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.19.0.tar.bz2 +Source0: yast2-pkg-bindings-2.19.1.tar.bz2 + Prefix: /usr + Group: System/YaST License: GPLv2+ BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools BuildRequires: libzypp-devel >= 6.10.0 + # new GPG callbacks Requires: libzypp >= 6.6.0 + Summary: YaST2 - Package Manager Access %description @@ -37,7 +42,7 @@ library in YaST2. %prep -%setup -n yast2-pkg-bindings-2.19.0 +%setup -n yast2-pkg-bindings-2.19.1 # build only the library, ignore documentation (it is in devel-doc package) echo "src" > SUBDIRS @@ -45,8 +50,10 @@ %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) @@ -60,6 +67,7 @@ d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done + rm -rf %{buildroot}/%{_libdir}/YaST2/plugin/libpy2Pkg.la %clean ++++++ yast2-pkg-bindings-2.19.0.tar.bz2 -> yast2-pkg-bindings-2.19.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.19.0/VERSION new/yast2-pkg-bindings-2.19.1/VERSION --- old/yast2-pkg-bindings-2.19.0/VERSION 2010-01-06 20:12:35.000000000 +0100 +++ new/yast2-pkg-bindings-2.19.1/VERSION 2010-04-21 19:25:24.000000000 +0200 @@ -1 +1 @@ -2.19.0 +2.19.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.19.0/configure new/yast2-pkg-bindings-2.19.1/configure --- old/yast2-pkg-bindings-2.19.0/configure 2010-01-06 20:14:22.000000000 +0100 +++ new/yast2-pkg-bindings-2.19.1/configure 2010-01-19 08:06:14.000000000 +0100 @@ -18678,7 +18678,6 @@ # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. # Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.19.0/libtool.m4 new/yast2-pkg-bindings-2.19.1/libtool.m4 --- old/yast2-pkg-bindings-2.19.0/libtool.m4 2010-01-06 20:14:15.000000000 +0100 +++ new/yast2-pkg-bindings-2.19.1/libtool.m4 2010-01-19 08:06:08.000000000 +0100 @@ -684,7 +684,6 @@ # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. # Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # _LT_COPYING diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.19.0/src/Resolvable_Properties.cc new/yast2-pkg-bindings-2.19.1/src/Resolvable_Properties.cc --- old/yast2-pkg-bindings-2.19.0/src/Resolvable_Properties.cc 2010-01-06 20:13:59.000000000 +0100 +++ new/yast2-pkg-bindings-2.19.1/src/Resolvable_Properties.cc 2010-01-18 16:31:02.000000000 +0100 @@ -19,7 +19,7 @@ */ /* - File: $Id: Resolvable_Properties.cc 60247 2010-01-06 19:13:58Z lslezak $ + File: $Id: Resolvable_Properties.cc 60435 2010-01-18 15:31:01Z lslezak $ Author: Ladislav Slezák <lslezak@novell.com> Summary: Resolvable properties Namespace: Pkg @@ -401,6 +401,7 @@ upgrades->add(YCPString("repository"), YCPString(upgrade.repository())); upgrades->add(YCPString("notify"), YCPBoolean(upgrade.notify())); upgrades->add(YCPString("status"), YCPString(upgrade.status())); + upgrades->add(YCPString("product"), YCPString(upgrade.product())); upgrade_list->add(upgrades); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.19.0/src/Service.cc new/yast2-pkg-bindings-2.19.1/src/Service.cc --- old/yast2-pkg-bindings-2.19.0/src/Service.cc 2009-04-29 12:58:11.000000000 +0200 +++ new/yast2-pkg-bindings-2.19.1/src/Service.cc 2010-04-21 21:16:46.000000000 +0200 @@ -19,7 +19,7 @@ */ /* - File: $Id: Service.cc 57028 2009-04-29 10:58:09Z lslezak $ + File: $Id: Service.cc 61814 2010-04-21 19:16:45Z lslezak $ Author: Ladislav Slezák <lslezak@novell.com> Summary: Functions for accessing services in the package management Namespace: Pkg @@ -373,7 +373,24 @@ } zypp::RepoManager repomanager = CreateRepoManager(); - return YCPBoolean(service_manager.RefreshService(alias->value(), repomanager)); + + if (!service_manager.RefreshService(alias->value(), repomanager)) + { + return YCPBoolean(false); + } + + // reload all repositories + for (RepoCont::size_type idx = 0; idx != repos.size(); ++idx) + { + // the repo has not been removed + if (!(repos[idx])->isDeleted()) + { + y2milestone("Reloading repository %s", (repos[idx])->repoInfo().alias().c_str()); + repos[idx]->repoInfo() = repomanager.getRepositoryInfo((repos[idx])->repoInfo().alias()); + } + } + + return YCPBoolean(true); } catch (const zypp::Exception& excpt) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.19.0/src/ServiceManager.cc new/yast2-pkg-bindings-2.19.1/src/ServiceManager.cc --- old/yast2-pkg-bindings-2.19.0/src/ServiceManager.cc 2009-02-24 13:30:45.000000000 +0100 +++ new/yast2-pkg-bindings-2.19.1/src/ServiceManager.cc 2010-04-21 19:31:42.000000000 +0200 @@ -107,6 +107,16 @@ } repomgr.refreshService(serv_it->second); + + // load the service from disk + PkgService new_service(repomgr.getService(alias), alias); + DBG << "Reloaded service: " << new_service; + + // remove the old service + _known_services.erase(serv_it); + // insert new + _known_services.insert(std::make_pair(alias, new_service)); + return true; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org