Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at Fri Mar 12 17:35:41 CET 2010. -------- --- libzypp/libzypp.changes 2010-02-26 15:22:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes 2010-03-12 15:31:00.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 12 14:46:25 CET 2010 - ma@suse.de + +- Fix handling of symlinked packages in package cache. (bnc #585409) +- version 6.30.5 (19) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libzypp-6.30.4.tar.bz2 New: ---- libzypp-6.30.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.dP654R/_old 2010-03-12 17:35:33.000000000 +0100 +++ /var/tmp/diff_new_pack.dP654R/_new 2010-03-12 17:35:33.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libzypp (Version 6.30.4) +# spec file for package libzypp (Version 6.30.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,7 +24,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on Summary: Package, Patch, Pattern, and Product Management -Version: 6.30.4 +Version: 6.30.5 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ libzypp-6.30.4.tar.bz2 -> libzypp-6.30.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.30.4/VERSION.cmake new/libzypp-6.30.5/VERSION.cmake --- old/libzypp-6.30.4/VERSION.cmake 2010-02-26 15:02:36.000000000 +0100 +++ new/libzypp-6.30.5/VERSION.cmake 2010-03-12 15:08:13.000000000 +0100 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "6") SET(LIBZYPP_COMPATMINOR "19") SET(LIBZYPP_MINOR "30") -SET(LIBZYPP_PATCH "4") +SET(LIBZYPP_PATCH "5") # -# LAST RELEASED: 6.30.3 (19) +# LAST RELEASED: 6.30.5 (19) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.30.4/package/libzypp.changes new/libzypp-6.30.5/package/libzypp.changes --- old/libzypp-6.30.4/package/libzypp.changes 2010-02-26 15:02:36.000000000 +0100 +++ new/libzypp-6.30.5/package/libzypp.changes 2010-03-12 15:08:13.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Mar 12 14:46:25 CET 2010 - ma@suse.de + +- Fix handling of symlinked packages in package cache. (bnc #585409) +- version 6.30.5 (19) + +------------------------------------------------------------------- Tue Feb 23 19:05:04 CET 2010 - jkupec@suse.cz - Avoiding use of 'guest' if 'credentials' is used when moutning Files old/libzypp-6.30.4/po/zypp-po.tar.bz2 and new/libzypp-6.30.5/po/zypp-po.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.30.4/zypp/PathInfo.cc new/libzypp-6.30.5/zypp/PathInfo.cc --- old/libzypp-6.30.4/zypp/PathInfo.cc 2010-02-26 15:02:37.000000000 +0100 +++ new/libzypp-6.30.5/zypp/PathInfo.cc 2010-03-12 15:08:13.000000000 +0100 @@ -769,6 +769,7 @@ const char *const argv[] = { "/bin/cp", + "--remove-destination", "--", file.asString().c_str(), dest.asString().c_str(), @@ -818,6 +819,15 @@ int hardlinkCopy( const Pathname & oldpath, const Pathname & newpath ) { MIL << "hardlinkCopy " << oldpath << " -> " << newpath; + + PathInfo oldpi( oldpath, PathInfo::LSTAT ); + if ( oldpi.isLink() ) + { + // dont hardlink symliknks! + return copy( oldpath, newpath ); + } + + // Here: no symlink if ( ::link( oldpath.asString().c_str(), newpath.asString().c_str() ) == -1 ) { switch ( errno ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.30.4/zypp/media/CredentialManager.cc new/libzypp-6.30.5/zypp/media/CredentialManager.cc --- old/libzypp-6.30.4/zypp/media/CredentialManager.cc 2010-02-26 15:02:39.000000000 +0100 +++ new/libzypp-6.30.5/zypp/media/CredentialManager.cc 2010-03-12 15:08:13.000000000 +0100 @@ -6,7 +6,7 @@ | /_____||_| |_| |_| | | | ---------------------------------------------------------------------*/ -/** \file zypp/media/CredentialManager.h +/** \file zypp/media/CredentialManager.cc * */ #include <iostream> @@ -45,7 +45,7 @@ - url::ViewOption::WITH_PASSWORD - url::ViewOption::WITH_QUERY_STR; - inline bool + bool AuthDataComparator::operator()( const AuthData_Ptr & lhs, const AuthData_Ptr & rhs) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.30.4/zypp/sat/Solvable.cc new/libzypp-6.30.5/zypp/sat/Solvable.cc --- old/libzypp-6.30.4/zypp/sat/Solvable.cc 2010-02-26 15:02:38.000000000 +0100 +++ new/libzypp-6.30.5/zypp/sat/Solvable.cc 2010-03-12 15:08:13.000000000 +0100 @@ -176,7 +176,11 @@ } else { - s = ::solvable_lookup_str_lang( _solvable, attr.id(), lang_r.code().c_str() ); + for ( Locale l( lang_r ); l != Locale::noCode; l = l.fallback() ) + if ( (s = ::solvable_lookup_str_lang( _solvable, attr.id(), l.code().c_str(), 0 )) ) + return s; + // here: no matching locale, so use default + s = ::solvable_lookup_str_lang( _solvable, attr.id(), 0, 0 ); } return s ? s : std::string(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.30.4/zypp/sat/Solvable.h new/libzypp-6.30.5/zypp/sat/Solvable.h --- old/libzypp-6.30.4/zypp/sat/Solvable.h 2010-02-26 15:02:38.000000000 +0100 +++ new/libzypp-6.30.5/zypp/sat/Solvable.h 2010-03-12 15:08:13.000000000 +0100 @@ -100,7 +100,7 @@ std::string lookupStrAttribute( const SolvAttr & attr ) const; /** \overload Trying to look up a translated string attribute. * - * Returns the translation for \c lang_r (\b no fallback locales). + * Returns the translation for \c lang_r. * * Passing an empty \ref Locale will return the string for the * current default locale (\see \ref ZConfig::TextLocale), ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org