Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2017-01-31 12:32:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2016-12-22 16:00:38.767581130 +0100 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2017-02-03 17:49:04.260207716 +0100 @@ -1,0 +2,10 @@ +Thu Jan 26 13:03:37 CET 2017 - [email protected] + +- Add API for updating the AutoInstalled db +- MediaCD: Fix mountpoint creation after failing udf mount (bsc#1022046) +- fix misleading indentation (fixes #65) +- Fix compilation error reported by GCC7 (#63). +- Prefer calling "repo2solv" rather than "repo2solv.sh" +- version 16.4.0 (0) + +------------------------------------------------------------------- Old: ---- libzypp-16.3.2.tar.bz2 New: ---- libzypp-16.4.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.Osg0hA/_old 2017-02-03 17:49:05.540027287 +0100 +++ /var/tmp/diff_new_pack.Osg0hA/_new 2017-02-03 17:49:05.540027287 +0100 @@ -1,7 +1,7 @@ # # spec file for package libzypp # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define force_gcc_46 0 Name: libzypp -Version: 16.3.2 +Version: 16.4.0 Release: 0 Url: git://gitorious.org/opensuse/libzypp.git Summary: Package, Patch, Pattern, and Product Management ++++++ libzypp-16.3.2.tar.bz2 -> libzypp-16.4.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.3.2/VERSION.cmake new/libzypp-16.4.0/VERSION.cmake --- old/libzypp-16.3.2/VERSION.cmake 2016-12-14 12:26:08.000000000 +0100 +++ new/libzypp-16.4.0/VERSION.cmake 2017-01-26 13:06:59.000000000 +0100 @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "16") SET(LIBZYPP_COMPATMINOR "0") -SET(LIBZYPP_MINOR "3") -SET(LIBZYPP_PATCH "2") +SET(LIBZYPP_MINOR "4") +SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 16.3.2 (0) +# LAST RELEASED: 16.4.0 (0) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.3.2/package/libzypp.changes new/libzypp-16.4.0/package/libzypp.changes --- old/libzypp-16.3.2/package/libzypp.changes 2016-12-14 12:26:08.000000000 +0100 +++ new/libzypp-16.4.0/package/libzypp.changes 2017-01-26 13:06:59.000000000 +0100 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu Jan 26 13:03:37 CET 2017 - [email protected] + +- Add API for updating the AutoInstalled db +- MediaCD: Fix mountpoint creation after failing udf mount (bsc#1022046) +- fix misleading indentation (fixes #65) +- Fix compilation error reported by GCC7 (#63). +- Prefer calling "repo2solv" rather than "repo2solv.sh" +- version 16.4.0 (0) + +------------------------------------------------------------------- Wed Dec 14 12:24:23 CET 2016 - [email protected] - Don't raise FileCheckException if user accepted a package with wrong diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.3.2/po/fr.po new/libzypp-16.4.0/po/fr.po --- old/libzypp-16.3.2/po/fr.po 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.0/po/fr.po 2016-12-29 18:36:09.000000000 +0100 @@ -20,10 +20,10 @@ "Project-Id-Version: zypp.fr\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-11-21 15:07+0100\n" -"PO-Revision-Date: 2016-07-13 08:38+0000\n" -"Last-Translator: Christine Gabriel <[email protected]>\n" -"Language-Team: French <https://l10n.opensuse.org/projects/libzypp/master/fr/"; -">\n" +"PO-Revision-Date: 2016-12-29 17:31+0000\n" +"Last-Translator: Benoît Monin <[email protected]>\n" +"Language-Team: French <https://l10n.opensuse.org/projects/libzypp/master/fr/>" +"\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -4595,6 +4595,8 @@ "Create attach point: Can't find a writable directory to create an attach " "point" msgstr "" +"Création d'un point d'attache : Impossible de trouver un répertoire pour " +"créer un point d'attache" #. !\todo add comma to the message for the next release #: zypp/media/MediaCIFS.cc:427 zypp/media/MediaCurl.cc:1687 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.3.2/po/it.po new/libzypp-16.4.0/po/it.po --- old/libzypp-16.3.2/po/it.po 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.0/po/it.po 2016-12-30 22:21:05.000000000 +0100 @@ -15,10 +15,10 @@ "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-11-21 15:07+0100\n" -"PO-Revision-Date: 2016-07-08 13:22+0000\n" -"Last-Translator: Sabrina D'Alessandro <[email protected]>\n" -"Language-Team: Italian <https://l10n.opensuse.org/projects/libzypp/master/it/"; -">\n" +"PO-Revision-Date: 2016-12-30 21:16+0000\n" +"Last-Translator: Alessio Adamo <[email protected]>\n" +"Language-Team: Italian " +"<https://l10n.opensuse.org/projects/libzypp/master/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -4573,6 +4573,8 @@ "Create attach point: Can't find a writable directory to create an attach " "point" msgstr "" +"Creazione del punto di collegamento: impossibile trovare una directory " +"scrivibile per creare un punto di collegamento" #. !\todo add comma to the message for the next release #: zypp/media/MediaCIFS.cc:427 zypp/media/MediaCurl.cc:1687 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.3.2/zypp/CpeId.cc new/libzypp-16.4.0/zypp/CpeId.cc --- old/libzypp-16.3.2/zypp/CpeId.cc 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.0/zypp/CpeId.cc 2017-01-10 15:57:07.000000000 +0100 @@ -845,9 +845,9 @@ case '*': if ( src.size() == 1 ) return true; // "*" matches always: superset - else - prefx = std::string::npos; - src.erase( 0, 1 ); + // else + prefx = std::string::npos; + src.erase( 0, 1 ); break; case '?': ++prefx; @@ -855,8 +855,8 @@ { if ( *it == '?' ) ++prefx; else break; } if ( src.size() == prefx ) return( trg.size() <= prefx ); // "??..?": superset if at most #prefx chars - else - src.erase( 0, prefx ); + // else + src.erase( 0, prefx ); break; default: break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.3.2/zypp/RepoManager.cc new/libzypp-16.4.0/zypp/RepoManager.cc --- old/libzypp-16.3.2/zypp/RepoManager.cc 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.0/zypp/RepoManager.cc 2016-12-19 11:46:09.000000000 +0100 @@ -1336,7 +1336,7 @@ scoped_ptr<MediaMounter> forPlainDirs; ExternalProgram::Arguments cmd; - cmd.push_back( "repo2solv.sh" ); + cmd.push_back( PathInfo( "/usr/bin/repo2solv" ).isFile() ? "repo2solv" : "repo2solv.sh" ); // repo2solv expects -o as 1st arg! cmd.push_back( "-o" ); cmd.push_back( solvfile.asString() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.3.2/zypp/Target.cc new/libzypp-16.4.0/zypp/Target.cc --- old/libzypp-16.3.2/zypp/Target.cc 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.0/zypp/Target.cc 2017-01-26 13:07:00.000000000 +0100 @@ -99,6 +99,9 @@ LocaleSet Target::requestedLocales( const Pathname & root_r ) { return target::TargetImpl::requestedLocales( root_r ); } + void Target::updateAutoInstalled() + { return _pimpl->updateAutoInstalled(); } + std::string Target::targetDistribution() const { return _pimpl->targetDistribution(); } std::string Target::targetDistribution( const Pathname & root_r ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.3.2/zypp/Target.h new/libzypp-16.4.0/zypp/Target.h --- old/libzypp-16.3.2/zypp/Target.h 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.0/zypp/Target.h 2017-01-26 13:07:00.000000000 +0100 @@ -127,6 +127,11 @@ */ static LocaleSet requestedLocales( const Pathname & root_r ); + /** Update the database of autoinstalled packages. + * This is done on commit, so you usually don't need to call this explicitly. + */ + void updateAutoInstalled(); + public: /** \name Base product and registration. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.3.2/zypp/base/StrMatcher.cc new/libzypp-16.4.0/zypp/base/StrMatcher.cc --- old/libzypp-16.3.2/zypp/base/StrMatcher.cc 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.0/zypp/base/StrMatcher.cc 2017-01-10 15:57:07.000000000 +0100 @@ -207,7 +207,7 @@ if ( ! string_r ) return false; // NULL never matches - return ::datamatcher_match( _matcher.get(), string_r ); + return ::datamatcher_match( _matcher.get(), string_r ); } /** The current searchstring. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.3.2/zypp/media/MediaCD.cc new/libzypp-16.4.0/zypp/media/MediaCD.cc --- old/libzypp-16.3.2/zypp/media/MediaCD.cc 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.0/zypp/media/MediaCD.cc 2017-01-26 13:07:00.000000000 +0100 @@ -409,12 +409,6 @@ // This also fills the _devices list on demand DeviceList detected( detectDevices( _url.getScheme() == "dvd" ? true : false ) ); - if( !isUseableAttachPoint( attachPoint() ) ) - { - setAttachPoint( createAttachPoint(), true ); - } - std::string mountpoint( attachPoint().asString() ); - Mount mount; MediaMountException merr; @@ -435,6 +429,7 @@ // try all devices in sequence int count = 0; + std::string mountpoint( attachPoint().asString() ); bool mountsucceeded = false; for ( DeviceList::iterator it = _devices.begin() ; ! mountsucceeded && it != _devices.end() ; ++it, ++count ) { @@ -531,6 +526,12 @@ { try { + if( !isUseableAttachPoint( attachPoint() ) ) + { + setAttachPoint( createAttachPoint(), true ); + mountpoint = attachPoint().asString(); + } + mount.mount(it->name, mountpoint, *fsit, options); setMediaSource(media); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.3.2/zypp/sat/Solvable.cc new/libzypp-16.4.0/zypp/sat/Solvable.cc --- old/libzypp-16.3.2/zypp/sat/Solvable.cc 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.0/zypp/sat/Solvable.cc 2017-01-26 13:07:00.000000000 +0100 @@ -141,10 +141,12 @@ else { for ( Locale l( lang_r ); l; l = l.fallback() ) + { if ( (s = ::solvable_lookup_str_lang( _solvable, attr.id(), l.c_str(), 0 )) ) return s; - // here: no matching locale, so use default - s = ::solvable_lookup_str_lang( _solvable, attr.id(), 0, 0 ); + } + // here: no matching locale, so use default + s = ::solvable_lookup_str_lang( _solvable, attr.id(), 0, 0 ); } return s ? s : std::string(); } @@ -375,6 +377,16 @@ return isSystem() && myPool().isOnSystemByUser( ident() ); } + bool Solvable::onSystemByAuto() const + { + return isSystem() && myPool().isOnSystemByAuto( ident() ); + } + + bool Solvable::identIsAutoInstalled() const + { + return myPool().isOnSystemByAuto( ident() ); + } + bool Solvable::multiversionInstall() const { NO_SOLVABLE_RETURN( false ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.3.2/zypp/sat/Solvable.h new/libzypp-16.4.0/zypp/sat/Solvable.h --- old/libzypp-16.3.2/zypp/sat/Solvable.h 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.0/zypp/sat/Solvable.h 2017-01-26 13:07:00.000000000 +0100 @@ -121,12 +121,18 @@ bool isSystem() const; /** Whether this is known to be installed on behalf of a user request. - * \note This is a hint guessed by evaluating an available install history. - * Returns \c false for non-system (uninstalled) solvables, or if no history - * is available. + * \note Returns \c false for non-system (uninstalled) solvables. */ bool onSystemByUser() const; + /** Whether this is known to be automatically installed (as dependency of a user request package). + * \note Returns \c false for non-system (uninstalled) solvables. + */ + bool onSystemByAuto() const; + + /** Whether an installed solvable with the same ident is flagged as AutoInstalled. */ + bool identIsAutoInstalled() const; + /** Whether different versions of this package can be installed at the same time. * Per default \c false. \see also \ref ZConfig::multiversion. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.3.2/zypp/sat/SolvableType.h new/libzypp-16.4.0/zypp/sat/SolvableType.h --- old/libzypp-16.3.2/zypp/sat/SolvableType.h 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.0/zypp/sat/SolvableType.h 2017-01-26 13:07:00.000000000 +0100 @@ -63,7 +63,7 @@ ResKind kind() const { return satSolvable().kind(); } bool isKind( const ResKind & kind_r ) const { return satSolvable().isKind( kind_r ); } template<class TRes> - bool isKind() const { return satSolvable().isKind<TRes>(); } + bool isKind() const { return satSolvable().template isKind<TRes>(); } template<class TIterator> bool isKind( TIterator begin, TIterator end ) const { return satSolvable().isKind( begin, end ); } @@ -77,6 +77,8 @@ bool isSystem() const { return satSolvable().isSystem(); } bool onSystemByUser() const { return satSolvable().onSystemByUser(); } + bool onSystemByAuto() const { return satSolvable().onSystemByAuto(); } + bool identIsAutoInstalled() const { return satSolvable().identIsAutoInstalled(); } bool multiversionInstall() const { return satSolvable().multiversionInstall(); } Date buildtime() const { return satSolvable().buildtime(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.3.2/zypp/sat/detail/PoolImpl.h new/libzypp-16.4.0/zypp/sat/detail/PoolImpl.h --- old/libzypp-16.3.2/zypp/sat/detail/PoolImpl.h 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.0/zypp/sat/detail/PoolImpl.h 2017-01-26 13:07:00.000000000 +0100 @@ -299,6 +299,9 @@ bool isOnSystemByUser( IdString ident_r ) const { return !_autoinstalled.contains( ident_r.id() ); } + + bool isOnSystemByAuto( IdString ident_r ) const + { return _autoinstalled.contains( ident_r.id() ); } //@} public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.3.2/zypp/target/SolvIdentFile.cc new/libzypp-16.4.0/zypp/target/SolvIdentFile.cc --- old/libzypp-16.3.2/zypp/target/SolvIdentFile.cc 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.0/zypp/target/SolvIdentFile.cc 2017-01-26 13:07:00.000000000 +0100 @@ -58,7 +58,15 @@ std::ofstream outs( tmp.path().c_str() ); outs << "# " << file_r.basename() << " generated " << Date::now() << endl; - dumpRange( outs, data_r.begin(), data_r.end(), "#", "\n", "\n", "\n", "#\n" ); + if ( true ) + { + std::set<IdString> sorted( data_r.begin(), data_r.end() ); + dumpRange( outs, sorted.begin(), sorted.end(), "#", "\n", "\n", "\n", "#\n" ); + } + else + { + dumpRange( outs, data_r.begin(), data_r.end(), "#", "\n", "\n", "\n", "#\n" ); + } outs.close(); if ( outs.good() ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.3.2/zypp/target/TargetImpl.cc new/libzypp-16.4.0/zypp/target/TargetImpl.cc --- old/libzypp-16.3.2/zypp/target/TargetImpl.cc 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.0/zypp/target/TargetImpl.cc 2017-01-26 13:07:00.000000000 +0100 @@ -1733,6 +1733,15 @@ return RequestedLocalesFile( home(needroot) / "RequestedLocales" ).locales(); } + void TargetImpl::updateAutoInstalled() + { + MIL << "updateAutoInstalled if changed..." << endl; + SolvIdentFile::Data newdata; + for ( auto id : sat::Pool::instance().autoInstalled() ) + newdata.insert( IdString(id) ); // explicit ctor! + _autoInstalledFile.setData( std::move(newdata) ); + } + std::string TargetImpl::targetDistribution() const { return baseproductdata( _root ).registerTarget(); } // static version: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.3.2/zypp/target/TargetImpl.h new/libzypp-16.4.0/zypp/target/TargetImpl.h --- old/libzypp-16.3.2/zypp/target/TargetImpl.h 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.0/zypp/target/TargetImpl.h 2017-01-26 13:07:00.000000000 +0100 @@ -162,6 +162,9 @@ /** \overload */ static LocaleSet requestedLocales( const Pathname & root_r ); + /** \copydoc Target::updateAutoInstalled */ + void updateAutoInstalled(); + /** \copydoc Target::targetDistribution() */ std::string targetDistribution() const; /** \overload */
