Hello community, here is the log from the commit of package libzypp for openSUSE:12.3 checked in at 2013-02-15 18:45:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/libzypp (Old) and /work/SRC/openSUSE:12.3/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.3/libzypp/libzypp.changes 2013-01-31 01:26:15.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.libzypp.new/libzypp.changes 2013-02-15 18:45:57.000000000 +0100 @@ -1,0 +2,21 @@ +Fri Feb 15 12:49:18 CET 2013 - [email protected] + +- Handle dangling update script symlinks in instsys. (bnc#803751) +- version 12.8.1 (0) + +------------------------------------------------------------------- +Thu Feb 14 01:13:28 CET 2013 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Feb 7 01:16:50 CET 2013 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Mon Feb 4 12:35:51 CET 2013 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Old: ---- libzypp-12.8.0.tar.bz2 New: ---- libzypp-12.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.aTPebT/_old 2013-02-15 18:45:57.000000000 +0100 +++ /var/tmp/diff_new_pack.aTPebT/_new 2013-02-15 18:45:57.000000000 +0100 @@ -24,7 +24,7 @@ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management -Version: 12.8.0 +Version: 12.8.1 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ libzypp-12.8.0.tar.bz2 -> libzypp-12.8.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.8.0/VERSION.cmake new/libzypp-12.8.1/VERSION.cmake --- old/libzypp-12.8.0/VERSION.cmake 2013-01-22 11:34:48.000000000 +0100 +++ new/libzypp-12.8.1/VERSION.cmake 2013-02-15 13:11:55.000000000 +0100 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "12") SET(LIBZYPP_COMPATMINOR "0") SET(LIBZYPP_MINOR "8") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") # -# LAST RELEASED: 12.8.0 (0) +# LAST RELEASED: 12.8.1 (0) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.8.0/package/libzypp.changes new/libzypp-12.8.1/package/libzypp.changes --- old/libzypp-12.8.0/package/libzypp.changes 2013-01-22 11:34:48.000000000 +0100 +++ new/libzypp-12.8.1/package/libzypp.changes 2013-02-15 13:11:54.000000000 +0100 @@ -1,4 +1,25 @@ ------------------------------------------------------------------- +Fri Feb 15 12:49:18 CET 2013 - [email protected] + +- Handle dangling update script symlinks in instsys. (bnc#803751) +- version 12.8.1 (0) + +------------------------------------------------------------------- +Thu Feb 14 01:13:28 CET 2013 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Feb 7 01:16:50 CET 2013 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Mon Feb 4 12:35:51 CET 2013 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Tue Jan 22 11:06:55 CET 2013 - [email protected] - make multicurl suppress progress reports for the metalink download Files old/libzypp-12.8.0/po/zypp-po.tar.bz2 and new/libzypp-12.8.1/po/zypp-po.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.8.0/zypp/target/TargetImpl.cc new/libzypp-12.8.1/zypp/target/TargetImpl.cc --- old/libzypp-12.8.0/zypp/target/TargetImpl.cc 2013-01-22 11:34:48.000000000 +0100 +++ new/libzypp-12.8.1/zypp/target/TargetImpl.cc 2013-02-15 13:11:54.000000000 +0100 @@ -358,26 +358,37 @@ continue; // if not exact match it had to continue with '-' PathInfo script( scriptsDir / *sit ); - if ( ! script.isFile() ) - continue; + Pathname localPath( scriptsPath_r/(*sit) ); // without root prefix + std::string unifytag; // must not stay empty - // Assert it's set executable - filesystem::addmod( script.path(), 0500 ); + if ( script.isFile() ) + { + // Assert it's set executable, unify by md5sum. + filesystem::addmod( script.path(), 0500 ); + unifytag = filesystem::md5sum( script.path() ); + } + else if ( ! script.isExist() ) + { + // Might be a dangling symlink, might be ok if we are in + // instsys (absolute symlink within the system below /mnt). + // readlink will tell.... + unifytag = filesystem::readlink( script.path() ).asString(); + } - Pathname localPath( scriptsPath_r/(*sit) ); // without root prefix + if ( unifytag.empty() ) + continue; - // Unify scripts by md5sum - std::string md5sum( filesystem::md5sum( script.path() ) ); - if ( unify[md5sum].empty() ) + // Unify scripts + if ( unify[unifytag].empty() ) { - unify[md5sum] = localPath; + unify[unifytag] = localPath; } else { // translators: We may find the same script content in files with different names. // Only the first occurence is executed, subsequent ones are skipped. It's a one-line // message for a log file. Preferably start translation with "%s" - std::string msg( str::form(_("%s already executed as %s)"), localPath.asString().c_str(), unify[md5sum].c_str() ) ); + std::string msg( str::form(_("%s already executed as %s)"), localPath.asString().c_str(), unify[unifytag].c_str() ) ); MIL << "Skip update script: " << msg << endl; HistoryLog().comment( msg, /*timestamp*/true ); continue; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
