Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2015-01-20 19:11:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-12-29 00:34:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2015-01-20 19:11:48.000000000 +0100 @@ -1,0 +2,25 @@ +Mon Jan 12 15:04:17 CET 2015 - m...@suse.de + +- Properly propagate repo variables in service refresh. +- Let $ZYPP_REPO_RELEASEVER overwrite $releasever in .repo files + (bnc#911658) +- Call pool_set_rootdir to properly check for file conflicts. +- Use xgettext --boost to support boost-format (%N%) +- version 14.34.0 (30) + +------------------------------------------------------------------- +Sun Jan 11 01:13:15 CET 2015 - m...@suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Jan 8 01:13:23 CET 2015 - m...@suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Jan 1 01:13:29 CET 2015 - m...@suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Old: ---- libzypp-14.33.0.tar.bz2 New: ---- libzypp-14.34.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.qMRaKO/_old 2015-01-20 19:11:49.000000000 +0100 +++ /var/tmp/diff_new_pack.qMRaKO/_new 2015-01-20 19:11:49.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libzypp # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products 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: 14.33.0 +Version: 14.34.0 Release: 0 Url: git://gitorious.org/opensuse/libzypp.git Summary: Package, Patch, Pattern, and Product Management ++++++ libzypp-14.33.0.tar.bz2 -> libzypp-14.34.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.33.0/VERSION.cmake new/libzypp-14.34.0/VERSION.cmake --- old/libzypp-14.33.0/VERSION.cmake 2014-12-19 13:37:01.000000000 +0100 +++ new/libzypp-14.34.0/VERSION.cmake 2015-01-12 15:29:25.000000000 +0100 @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "14") SET(LIBZYPP_COMPATMINOR "30") -SET(LIBZYPP_MINOR "33") +SET(LIBZYPP_MINOR "34") SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 14.33.0 (30) +# LAST RELEASED: 14.34.0 (30) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.33.0/doc/autoinclude/EnvironmentVariables.doc new/libzypp-14.34.0/doc/autoinclude/EnvironmentVariables.doc --- old/libzypp-14.33.0/doc/autoinclude/EnvironmentVariables.doc 2014-07-11 13:45:16.000000000 +0200 +++ new/libzypp-14.34.0/doc/autoinclude/EnvironmentVariables.doc 2015-01-12 15:29:25.000000000 +0100 @@ -13,6 +13,10 @@ \li \c ZYPP_CONF=<PATH> Location of the zypp.conf file. \li \c ZYPP_LOCK_TIMEOUT=<sec> If zypp is locked by another process wait this number of seconds for the lock becoming available. +\subsection zypp-envars-repos Variables related to repositories + +\li \c ZYPP_REPO_RELEASEVER=<ver> Overwrite the \c $releasever variable in repository URLs and names (\see zypp::repo::RepoVariablesStringReplacer). + \subsection zypp-envars-commit Variables related to commit \li \c ZYPP_IS_RUNNING=1 Set during commit so packages pre/post/trigger scripts can detect whether rpm was called from within libzypp. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.33.0/package/libzypp.changes new/libzypp-14.34.0/package/libzypp.changes --- old/libzypp-14.33.0/package/libzypp.changes 2014-12-21 01:17:03.000000000 +0100 +++ new/libzypp-14.34.0/package/libzypp.changes 2015-01-12 15:29:25.000000000 +0100 @@ -1,4 +1,29 @@ ------------------------------------------------------------------- +Mon Jan 12 15:04:17 CET 2015 - m...@suse.de + +- Properly propagate repo variables in service refresh. +- Let $ZYPP_REPO_RELEASEVER overwrite $releasever in .repo files + (bnc#911658) +- Call pool_set_rootdir to properly check for file conflicts. +- Use xgettext --boost to support boost-format (%N%) +- version 14.34.0 (30) + +------------------------------------------------------------------- +Sun Jan 11 01:13:15 CET 2015 - m...@suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Jan 8 01:13:23 CET 2015 - m...@suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Jan 1 01:13:29 CET 2015 - m...@suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Sun Dec 21 01:13:33 CET 2014 - m...@suse.de - Update zypp-po.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.33.0/po/createPot new/libzypp-14.34.0/po/createPot --- old/libzypp-14.33.0/po/createPot 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.34.0/po/createPot 2015-01-07 08:29:00.000000000 +0100 @@ -10,4 +10,4 @@ -o -name "*.cc" \ -o -name "*.cpp"` #calling xgettext with the sourcefiles -xgettext -s --no-wrap --add-comments --add-location --keyword=_ --keyword=_:1,2 --keyword=__ --keyword=N_ --foreign-user --copyright-holder="SuSE Linux Products GmbH, Nuernberg" --default-domain=libzypp --output="$POTFILE" $SRCFILES +xgettext -L C++ --boost -s --no-wrap --add-comments --add-location --keyword=_ --keyword=_:1,2 --keyword=__ --keyword=N_ --foreign-user --copyright-holder="SuSE Linux Products GmbH, Nuernberg" --default-domain=libzypp --output="$POTFILE" $SRCFILES Files old/libzypp-14.33.0/po/zypp-po.tar.bz2 and new/libzypp-14.34.0/po/zypp-po.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.33.0/zypp/RepoInfo.cc new/libzypp-14.34.0/zypp/RepoInfo.cc --- old/libzypp-14.33.0/zypp/RepoInfo.cc 2014-12-10 16:09:01.000000000 +0100 +++ new/libzypp-14.34.0/zypp/RepoInfo.cc 2015-01-12 15:29:25.000000000 +0100 @@ -68,19 +68,22 @@ Pathname licenseTgz() const { return metadatapath.empty() ? Pathname() : metadatapath / path / "license.tar.gz"; } - Url getmirrorListUrl() const + Url mirrorListUrl() const { return replacer(mirrorlist_url); } - Url &setmirrorListUrl() + void mirrorListUrl( const Url & url_r ) + { mirrorlist_url = url_r; } + + const Url & rawMirrorListUrl() const { return mirrorlist_url; } const url_set & baseUrls() const { - if ( _baseUrls.empty() && ! getmirrorListUrl().asString().empty() ) + if ( _baseUrls.empty() && ! mirrorListUrl().asString().empty() ) { emptybaseurls = true; DBG << "MetadataPath: " << metadatapath << endl; - repo::RepoMirrorList rmurls( getmirrorListUrl(), metadatapath ); + repo::RepoMirrorList rmurls( mirrorListUrl(), metadatapath ); _baseUrls.insert( _baseUrls.end(), rmurls.getUrls().begin(), rmurls.getUrls().end() ); } return _baseUrls; @@ -214,7 +217,7 @@ { _pimpl->gpgcheck = check; } void RepoInfo::setMirrorListUrl( const Url & url_r ) - { _pimpl->setmirrorListUrl() = url_r; } + { _pimpl->mirrorListUrl( url_r ); } void RepoInfo::setGpgKeyUrl( const Url & url_r ) { _pimpl->gpgkey_url = url_r; } @@ -274,7 +277,10 @@ { return _pimpl->type; } Url RepoInfo::mirrorListUrl() const - { return _pimpl->getmirrorListUrl(); } + { return _pimpl->mirrorListUrl(); } + + Url RepoInfo::rawMirrorListUrl() const + { return _pimpl->rawMirrorListUrl(); } Url RepoInfo::gpgKeyUrl() const { return _pimpl->gpgkey_url; } @@ -291,6 +297,9 @@ std::string RepoInfo::targetDistribution() const { return _pimpl->targetDistro; } + Url RepoInfo::rawUrl() const + { return( _pimpl->baseUrls().empty() ? Url() : *_pimpl->baseUrls().begin() ); } + RepoInfo::urls_const_iterator RepoInfo::baseUrlsBegin() const { return make_transform_iterator( _pimpl->baseUrls().begin(), @@ -351,7 +360,7 @@ accept = false; } } - MIL << "License for " << this->name() << " has to be accepted: " << (accept?"true":"false" ) << endl; + MIL << "License for " << name() << " has to be accepted: " << (accept?"true":"false" ) << endl; return accept; } @@ -450,7 +459,7 @@ str << tag_r << value_r << std::endl; }); - strif( "- mirrorlist : ", _pimpl->getmirrorListUrl().asString() ); + strif( "- mirrorlist : ", _pimpl->rawMirrorListUrl().asString() ); strif( "- path : ", path().asString() ); str << "- type : " << type() << std::endl; str << "- priority : " << priority() << std::endl; @@ -486,8 +495,8 @@ if ( ! _pimpl->path.empty() ) str << "path="<< path() << endl; - if ( ! (_pimpl->getmirrorListUrl().asString().empty()) ) - str << "mirrorlist=" << _pimpl->getmirrorListUrl() << endl; + if ( ! (_pimpl->rawMirrorListUrl().asString().empty()) ) + str << "mirrorlist=" << _pimpl->rawMirrorListUrl() << endl; str << "type=" << type().asString() << endl; @@ -530,8 +539,8 @@ if ( _pimpl->baseurl2dump() ) { - for ( const auto & url : _pimpl->baseUrls() ) - str << "<url>" << escape(url.asString()) << "</url>" << endl; + for_( it, baseUrlsBegin(), baseUrlsEnd() ) // !transform iterator replaces variables + str << "<url>" << escape((*it).asString()) << "</url>" << endl; } str << "</repo>" << endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.33.0/zypp/RepoInfo.h new/libzypp-14.34.0/zypp/RepoInfo.h --- old/libzypp-14.33.0/zypp/RepoInfo.h 2014-12-10 16:09:01.000000000 +0100 +++ new/libzypp-14.34.0/zypp/RepoInfo.h 2015-01-12 15:29:25.000000000 +0100 @@ -63,6 +63,9 @@ * * \note A RepoInfo is a hint about how * to create a Repository. + * + * \note Name, baseUrls and mirrorUrl are subject to repo variable replacement + * (\see \ref RepoVariablesStringReplacer). */ class RepoInfo : public repo::RepoInfoBase { @@ -100,7 +103,8 @@ */ bool baseUrlsEmpty() const; /** - * whether there are manualy configured repository urls + * Whether there are manualy configured repository urls. + * If \c false, a mirrorlist might be used. */ bool baseUrlSet() const; /** @@ -121,6 +125,10 @@ Url url() const { return( baseUrlsEmpty() ? Url() : *baseUrlsBegin()); } /** + * Pars pro toto: The first repository url (no variables replaced) + */ + Url rawUrl() const; + /** * A Url under which the metadata are located, or a set of mirrors. * * This can't be empty in order the repository to be valid @@ -174,6 +182,10 @@ */ Url mirrorListUrl() const; /** + * The raw mirrorListUrl (no variables replaced). + */ + Url rawMirrorListUrl() const; + /** * Set mirror list url. \see mirrorListUrl * \param url The base url for the list */ @@ -374,11 +386,13 @@ /** * Write this RepoInfo object into \a str in a <tr>.repo</tt> file format. + * Raw values, no variable replacement. */ virtual std::ostream & dumpAsIniOn( std::ostream & str ) const; /** * Write an XML representation of this RepoInfo object. + * Repo variables replaced. * * \param str * \param content this argument is ignored (used in other classed derived diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.33.0/zypp/RepoManager.cc new/libzypp-14.34.0/zypp/RepoManager.cc --- old/libzypp-14.33.0/zypp/RepoManager.cc 2014-10-15 15:12:42.000000000 +0200 +++ new/libzypp-14.34.0/zypp/RepoManager.cc 2015-01-12 15:29:25.000000000 +0100 @@ -1989,7 +1989,7 @@ else { // service repo can contain only one URL now, so no need to iterate. - url = *it->baseUrlsBegin(); + url = it->rawUrl(); // raw! } // libzypp currently has problem with separate url + path handling @@ -2139,6 +2139,14 @@ // all other attributes follow the service request: + // changed name (raw!) + if ( oldRepo->rawName() != it->rawName() ) + { + DBG << "Service repo " << it->alias() << " gets new NAME " << it->rawName() << endl; + oldRepo->setName( it->rawName() ); + oldRepoModified = true; + } + // changed autorefresh if ( oldRepo->autorefresh() != it->autorefresh() ) { @@ -2157,10 +2165,10 @@ // changed url? // service repo can contain only one URL now, so no need to iterate. - if ( oldRepo->url() != it->url() ) + if ( oldRepo->rawUrl() != it->rawUrl() ) { - DBG << "Service repo " << it->alias() << " gets new URL " << it->url() << endl; - oldRepo->setBaseUrl( it->url() ); + DBG << "Service repo " << it->alias() << " gets new URL " << it->rawUrl() << endl; + oldRepo->setBaseUrl( it->rawUrl() ); oldRepoModified = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.33.0/zypp/repo/RepoInfoBase.cc new/libzypp-14.34.0/zypp/repo/RepoInfoBase.cc --- old/libzypp-14.33.0/zypp/repo/RepoInfoBase.cc 2014-07-11 13:45:16.000000000 +0200 +++ new/libzypp-14.34.0/zypp/repo/RepoInfoBase.cc 2015-01-12 15:29:25.000000000 +0100 @@ -116,11 +116,14 @@ std::string RepoInfoBase::name() const { - if ( _pimpl->_name.empty() ) + if ( rawName().empty() ) return alias(); - return repo::RepoVariablesStringReplacer()( _pimpl->_name ); + return repo::RepoVariablesStringReplacer()( rawName() ); } + std::string RepoInfoBase::rawName() const + { return _pimpl->_name; } + std::string RepoInfoBase::label() const { if ( ZConfig::instance().repoLabelIsAlias() ) @@ -136,7 +139,8 @@ { str << "--------------------------------------" << std::endl; str << "- alias : " << alias() << std::endl; - str << "- name : " << name() << std::endl; + if ( ! rawName().empty() ) + str << "- name : " << rawName() << std::endl; str << "- enabled : " << enabled() << std::endl; str << "- autorefresh : " << autorefresh() << std::endl; @@ -147,7 +151,8 @@ { // we save the original data without variable replacement str << "[" << alias() << "]" << endl; - str << "name=" << name() << endl; + if ( ! rawName().empty() ) + str << "name=" << rawName() << endl; str << "enabled=" << (enabled() ? "1" : "0") << endl; str << "autorefresh=" << (autorefresh() ? "1" : "0") << endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.33.0/zypp/repo/RepoInfoBase.h new/libzypp-14.34.0/zypp/repo/RepoInfoBase.h --- old/libzypp-14.33.0/zypp/repo/RepoInfoBase.h 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.34.0/zypp/repo/RepoInfoBase.h 2015-01-12 15:29:25.000000000 +0100 @@ -32,6 +32,9 @@ /** * \short Base class implementing common features of \ref RepoInfo and * \ref ServiceInfo. + * + * \note Name is subject to repo variable replacement + * (\see \ref RepoVariablesStringReplacer). */ class RepoInfoBase { @@ -57,13 +60,17 @@ std::string escaped_alias() const; /** - * \short Repository short label + * \short Repository name * - * Short label or description of the repository. + * Short label or description of the repository. Defaults to \ref alias. + * Subject to repo variable replacement (\see \ref RepoVariablesStringReplacer). * ie: "SUSE Linux 10.2 updates" */ std::string name() const; + /** The raw metadata name (no default, no variables replaced). */ + std::string rawName() const; + /** * \short Label for use in messages for the user interface. * @@ -139,13 +146,14 @@ virtual std::ostream & dumpOn( std::ostream & str ) const; /** - * Write this RepoInfoBase object into \a str in - * a <tr>.repo</tt> (ini) file format. + * Write this RepoInfoBase object into \a str in a <tr>.repo</tt> (ini) file format. + * Raw values, no variable replacement. */ virtual std::ostream & dumpAsIniOn( std::ostream & str ) const; /** * Write an XML representation of this object with content (if available). + * Repo variables replaced. */ virtual std::ostream & dumpAsXmlOn( std::ostream & str, const std::string & content = "" ) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.33.0/zypp/repo/RepoVariables.cc new/libzypp-14.34.0/zypp/repo/RepoVariables.cc --- old/libzypp-14.33.0/zypp/repo/RepoVariables.cc 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.34.0/zypp/repo/RepoVariables.cc 2015-01-12 15:29:25.000000000 +0100 @@ -19,6 +19,16 @@ /////////////////////////////////////////////////////////////////// namespace zypp { + namespace env + { + /** Use faked releasever (e.g. for 'zupper dup' to next distro version */ + inline std::string ZYPP_REPO_RELEASEVER() + { + const char * env = getenv("ZYPP_REPO_RELEASEVER"); + return( env ? env : "" ); + } + } + /////////////////////////////////////////////////////////////////// namespace repo { @@ -46,7 +56,13 @@ const std::string & releasever() const { if( _releasever.empty() ) - _releasever = Target::distributionVersion( Pathname()/*guess*/ ); + { + _releasever = env::ZYPP_REPO_RELEASEVER(); + if( _releasever.empty() ) + _releasever = Target::distributionVersion( Pathname()/*guess*/ ); + else + WAR << "ENV overwrites $releasever=" << _releasever << endl; + } return _releasever; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.33.0/zypp/repo/RepoVariables.h new/libzypp-14.34.0/zypp/repo/RepoVariables.h --- old/libzypp-14.33.0/zypp/repo/RepoVariables.h 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.34.0/zypp/repo/RepoVariables.h 2015-01-12 15:29:25.000000000 +0100 @@ -25,6 +25,18 @@ * * Replaces '$arch', '$basearch' and $releasever in a string * with the global ZYpp values. + * + * \note The $releasever value is overwritten by the environment + * variable \c ZYPP_REPO_RELEASEVER. This might be handy for + * distribution upogrades like this: + * \code + * $ export ZYPP_REPO_RELEASEVER=13.2 + * $ zypper lr -u + * $ zypper dup + * ....upgrades to 13.2... + * \endcode + * (see \ref zypp-envars) + * * \code * Example: * ftp://user:sec...@site.net/$arch/ -> ftp://user:sec...@site.net/i686/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.33.0/zypp/sat/Pool.cc new/libzypp-14.34.0/zypp/sat/Pool.cc --- old/libzypp-14.33.0/zypp/sat/Pool.cc 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.34.0/zypp/sat/Pool.cc 2015-01-07 13:05:00.000000000 +0100 @@ -48,6 +48,12 @@ void Pool::prepareForSolving() const { return myPool().prepareForSolving(); } + Pathname Pool::rootDir() const + { return myPool().rootDir(); } + + void Pool::rootDir( const Pathname & root_r ) + { return myPool().rootDir( root_r ); } + bool Pool::reposEmpty() const { return ! myPool()->urepos; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.33.0/zypp/sat/Pool.h new/libzypp-14.34.0/zypp/sat/Pool.h --- old/libzypp-14.33.0/zypp/sat/Pool.h 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.34.0/zypp/sat/Pool.h 2015-01-07 13:05:00.000000000 +0100 @@ -69,6 +69,12 @@ /** \ref prepare plus some expensive checks done before solving only. */ void prepareForSolving() const; + /** Get rootdir (for file conflicts check) */ + Pathname rootDir() const; + + /** Set rootdir (for file conflicts check) */ + void rootDir( const Pathname & root_r ); + public: /** Whether \ref Pool contains repos. */ bool reposEmpty() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.33.0/zypp/sat/detail/PoolImpl.h new/libzypp-14.34.0/zypp/sat/detail/PoolImpl.h --- old/libzypp-14.33.0/zypp/sat/detail/PoolImpl.h 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.34.0/zypp/sat/detail/PoolImpl.h 2015-01-07 13:05:00.000000000 +0100 @@ -94,6 +94,22 @@ ::_Repo * systemRepo() const { return _pool->installed; } + /** Get rootdir (for file conflicts check) */ + Pathname rootDir() const + { + const char * rd = ::pool_get_rootdir( _pool ); + return( rd ? rd : "/" ); + } + + /** Set rootdir (for file conflicts check) */ + void rootDir( const Pathname & root_r ) + { + if ( root_r.empty() || root_r == "/" ) + ::pool_set_rootdir( _pool, nullptr ); + else + ::pool_set_rootdir( _pool, root_r.c_str() ); + } + public: /** \name Actions invalidating housekeeping data. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.33.0/zypp/target/TargetImpl.cc new/libzypp-14.34.0/zypp/target/TargetImpl.cc --- old/libzypp-14.33.0/zypp/target/TargetImpl.cc 2014-12-19 13:37:01.000000000 +0100 +++ new/libzypp-14.34.0/zypp/target/TargetImpl.cc 2015-01-07 13:05:00.000000000 +0100 @@ -1170,6 +1170,7 @@ system.addSolv( rpmsolv ); } + sat::Pool::instance().rootDir( _root ); // (Re)Load the requested locales et al. // If the requested locales are empty, we leave the pool untouched -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org