Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2011-11-05 10:59:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2011-10-24 16:16:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2011-11-05 11:25:34.000000000 +0100 @@ -1,0 +2,21 @@ +Thu Nov 3 14:58:42 CET 2011 - [email protected] + +- Let RepoInfo::keepPackages properly default to FALSE (bnc#727385) +- version 10.3.2 (3) + +------------------------------------------------------------------- +Thu Nov 3 01:13:12 CET 2011 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Sun Oct 30 01:14:41 CEST 2011 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Oct 27 01:14:10 CEST 2011 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Old: ---- libzypp-10.3.1.tar.bz2 New: ---- libzypp-10.3.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.yRPBVa/_old 2011-11-05 11:25:56.000000000 +0100 +++ /var/tmp/diff_new_pack.yRPBVa/_new 2011-11-05 11:25:56.000000000 +0100 @@ -23,7 +23,7 @@ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management -Version: 10.3.1 +Version: 10.3.2 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc @@ -52,7 +52,7 @@ BuildRequires: boost-devel BuildRequires: dejagnu BuildRequires: doxygen -BuildRequires: gcc-c++ >= 4.5 +BuildRequires: gcc-c++ >= 4.6 BuildRequires: gettext-devel BuildRequires: graphviz BuildRequires: libxml2-devel ++++++ libzypp-10.3.1.tar.bz2 -> libzypp-10.3.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.1/VERSION.cmake new/libzypp-10.3.2/VERSION.cmake --- old/libzypp-10.3.1/VERSION.cmake 2011-10-24 13:51:57.000000000 +0200 +++ new/libzypp-10.3.2/VERSION.cmake 2011-11-03 17:59:07.000000000 +0100 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "10") SET(LIBZYPP_COMPATMINOR "3") SET(LIBZYPP_MINOR "3") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_PATCH "2") # -# LAST RELEASED: 10.3.1 (3) +# LAST RELEASED: 10.3.2 (3) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.1/doc/autodoc/Doxyfile.cmake new/libzypp-10.3.2/doc/autodoc/Doxyfile.cmake --- old/libzypp-10.3.1/doc/autodoc/Doxyfile.cmake 2011-10-24 13:51:57.000000000 +0200 +++ new/libzypp-10.3.2/doc/autodoc/Doxyfile.cmake 2011-11-03 17:59:07.000000000 +0100 @@ -76,7 +76,7 @@ EXCLUDE = EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = -EXAMPLE_PATH = @ZYPP_DOCINCLUDE_DIR@ @ZYPP_EXAMPLE_DIR@ +EXAMPLE_PATH = @ZYPP_DOCINCLUDE_DIR@ @ZYPP_EXAMPLE_DIR@ @LIBZYPP_SOURCE_DIR@ EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO IMAGE_PATH = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.1/libzypp.spec.cmake new/libzypp-10.3.2/libzypp.spec.cmake --- old/libzypp-10.3.1/libzypp.spec.cmake 2011-10-24 13:51:57.000000000 +0200 +++ new/libzypp-10.3.2/libzypp.spec.cmake 2011-11-03 17:59:07.000000000 +0100 @@ -52,7 +52,7 @@ BuildRequires: boost-devel BuildRequires: dejagnu BuildRequires: doxygen -BuildRequires: gcc-c++ >= 4.5 +BuildRequires: gcc-c++ >= 4.6 BuildRequires: gettext-devel BuildRequires: graphviz BuildRequires: libxml2-devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.1/package/libzypp.changes new/libzypp-10.3.2/package/libzypp.changes --- old/libzypp-10.3.1/package/libzypp.changes 2011-10-24 13:51:57.000000000 +0200 +++ new/libzypp-10.3.2/package/libzypp.changes 2011-11-03 17:59:07.000000000 +0100 @@ -1,4 +1,25 @@ ------------------------------------------------------------------- +Thu Nov 3 14:58:42 CET 2011 - [email protected] + +- Let RepoInfo::keepPackages properly default to FALSE (bnc#727385) +- version 10.3.2 (3) + +------------------------------------------------------------------- +Thu Nov 3 01:13:12 CET 2011 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Sun Oct 30 01:14:41 CEST 2011 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Oct 27 01:14:10 CEST 2011 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Mon Oct 24 13:35:56 CEST 2011 - [email protected] - Explicitly include textLocale in package translation download Files old/libzypp-10.3.1/po/zypp-po.tar.bz2 and new/libzypp-10.3.2/po/zypp-po.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.1/tests/zypp/RepoManager_test.cc new/libzypp-10.3.2/tests/zypp/RepoManager_test.cc --- old/libzypp-10.3.1/tests/zypp/RepoManager_test.cc 2011-10-24 13:51:57.000000000 +0200 +++ new/libzypp-10.3.2/tests/zypp/RepoManager_test.cc 2011-11-03 17:59:07.000000000 +0100 @@ -287,16 +287,8 @@ { RepoInfo repo; repo.setAlias("foo"); - repo.addBaseUrl(string("http://test.org";)); - BOOST_CHECK_MESSAGE( repo.keepPackages(), "http scheme is not cached"); - repo.setBaseUrl(string("ftp://test.org";)); - BOOST_CHECK_MESSAGE( repo.keepPackages(), "ftp scheme is not cached"); - repo.setBaseUrl(string("smb://test.org")); - BOOST_CHECK_MESSAGE( !repo.keepPackages(), "smb scheme is cached"); - repo.setBaseUrl(string("file:///test.txt")); - BOOST_CHECK_MESSAGE( !repo.keepPackages(), "file scheme is cached"); repo.setBaseUrl(string("http://test.org";)); - BOOST_CHECK_MESSAGE( repo.keepPackages(), "cache is depend on second url."); + BOOST_CHECK_MESSAGE( !repo.keepPackages(), "keepPackages must default to OFF"); } //! \todo test this diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.1/zypp/RepoInfo.cc new/libzypp-10.3.2/zypp/RepoInfo.cc --- old/libzypp-10.3.1/zypp/RepoInfo.cc 2011-10-24 13:51:57.000000000 +0200 +++ new/libzypp-10.3.2/zypp/RepoInfo.cc 2011-11-03 17:59:08.000000000 +0100 @@ -65,14 +65,10 @@ { return metadatapath.empty() ? Pathname() : metadatapath / path / "license.tar.gz"; } Url getmirrorListUrl() const - { - return replacer(mirrorlist_url); - } + { return replacer(mirrorlist_url); } Url &setmirrorListUrl() - { - return mirrorlist_url; - } + { return mirrorlist_url; } const std::set<Url> &baseUrls() const { @@ -96,27 +92,10 @@ } std::set<Url> &baseUrls() - { - return _baseUrls; - } + { return _baseUrls; } bool baseurl2dump() const - { - return !emptybaseurls && !_baseUrls.empty(); - } - - /** Compute a resonable default for keepPackages based on URL scheme. */ - bool keepPackagesDefault() const - { - if (indeterminate(keeppackages)) - { - if (_baseUrls.empty()) - return mirrorlist_url.schemeIsDownloading(); - else - return _baseUrls.begin()->schemeIsDownloading(); - } - return (bool) keeppackages; - } + { return !emptybaseurls && !_baseUrls.empty(); } public: TriBool gpgcheck; @@ -178,32 +157,24 @@ unsigned RepoInfo::priority() const { return _pimpl->priority; } + unsigned RepoInfo::defaultPriority() { return Impl::defaultPriority; } + void RepoInfo::setPriority( unsigned newval_r ) - { - _pimpl->priority = newval_r ? newval_r : Impl::defaultPriority; - } + { _pimpl->priority = newval_r ? newval_r : Impl::defaultPriority; } void RepoInfo::setGpgCheck( bool check ) - { - _pimpl->gpgcheck = check; - } + { _pimpl->gpgcheck = check; } void RepoInfo::setMirrorListUrl( const Url &url ) - { - _pimpl->setmirrorListUrl() = url; - } + { _pimpl->setmirrorListUrl() = url; } void RepoInfo::setGpgKeyUrl( const Url &url ) - { - _pimpl->gpgkey_url = url; - } + { _pimpl->gpgkey_url = url; } void RepoInfo::addBaseUrl( const Url &url ) - { - _pimpl->baseUrls().insert(url); - } + { _pimpl->baseUrls().insert(url); } void RepoInfo::setBaseUrl( const Url &url ) { @@ -212,47 +183,35 @@ } void RepoInfo::setPath( const Pathname &path ) - { - _pimpl->path = path; - } + { _pimpl->path = path; } void RepoInfo::setType( const repo::RepoType &t ) - { - _pimpl->type = t; - } + { _pimpl->type = t; } void RepoInfo::setProbedType( const repo::RepoType &t ) const { _pimpl->setProbedType( t ); } void RepoInfo::setMetadataPath( const Pathname &path ) - { - _pimpl->metadatapath = path; - } + { _pimpl->metadatapath = path; } void RepoInfo::setPackagesPath( const Pathname &path ) - { - _pimpl->packagespath = path; - } + { _pimpl->packagespath = path; } void RepoInfo::setKeepPackages( bool keep ) - { - _pimpl->keeppackages = keep; - } + { _pimpl->keeppackages = keep; } void RepoInfo::setService( const std::string& name ) - { - _pimpl->service = name; - } + { _pimpl->service = name; } - void RepoInfo::setTargetDistribution( - const std::string & targetDistribution) - { - _pimpl->targetDistro = targetDistribution; - } + void RepoInfo::setTargetDistribution( const std::string & targetDistribution ) + { _pimpl->targetDistro = targetDistribution; } bool RepoInfo::gpgCheck() const - { return indeterminate(_pimpl->gpgcheck) ? true : (bool) _pimpl->gpgcheck; } + { return indeterminate(_pimpl->gpgcheck) ? true : (bool)_pimpl->gpgcheck; } + + bool RepoInfo::keepPackages() const + { return indeterminate(_pimpl->keeppackages) ? false : (bool)_pimpl->keeppackages; } Pathname RepoInfo::metadataPath() const { return _pimpl->metadatapath; } @@ -264,9 +223,7 @@ { return _pimpl->type; } Url RepoInfo::mirrorListUrl() const - { - return _pimpl->getmirrorListUrl(); - } + { return _pimpl->getmirrorListUrl(); } Url RepoInfo::gpgKeyUrl() const { return _pimpl->gpgkey_url; } @@ -315,12 +272,6 @@ bool RepoInfo::baseUrlSet() const { return _pimpl->baseurl2dump(); } - // false by default (if not set by setKeepPackages) - bool RepoInfo::keepPackages() const - { - return _pimpl->keepPackagesDefault(); - } - /////////////////////////////////////////////////////////////////// bool RepoInfo::hasLicense() const @@ -423,30 +374,27 @@ str << "- url : " << *it << std::endl; } } - if ( ! (_pimpl->getmirrorListUrl().asString().empty()) ) - { - str << "- mirrorlist : " << _pimpl->getmirrorListUrl() << std::endl; - } - str << "- path : " << path() << std::endl; + + // print if non empty value + auto strif( [&] ( const std::string & tag_r, const std::string & value_r ) { + if ( ! value_r.empty() ) + str << tag_r << value_r << std::endl; + }); + + strif( "- mirrorlist : ", _pimpl->getmirrorListUrl().asString() ); + strif( "- path : ", path().asString() ); str << "- type : " << type() << std::endl; str << "- priority : " << priority() << std::endl; - str << "- gpgcheck : " << gpgCheck() << std::endl; - str << "- gpgkey : " << gpgKeyUrl() << std::endl; + strif( "- gpgkey : ", gpgKeyUrl().asString() ); - if (!indeterminate(_pimpl->keeppackages)) + if ( ! indeterminate(_pimpl->keeppackages) ) str << "- keeppackages: " << keepPackages() << std::endl; - str << "- service : " << service() << std::endl; - - if (!targetDistribution().empty()) - str << "- targetdistro: " << targetDistribution() << std::endl; - - if (!metadataPath().empty()) - str << "- metadataPath: " << metadataPath() << std::endl; - - if (!packagesPath().empty()) - str << "- packagesPath: " << packagesPath() << std::endl; + strif( "- service : ", service() ); + strif( "- targetdistro: ", targetDistribution() ); + strif( "- metadataPath: ", metadataPath().asString() ); + strif( "- packagesPath: ", packagesPath().asString() ); return str; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.1/zypp/RepoInfo.h new/libzypp-10.3.2/zypp/RepoInfo.h --- old/libzypp-10.3.1/zypp/RepoInfo.h 2011-10-24 13:51:58.000000000 +0200 +++ new/libzypp-10.3.2/zypp/RepoInfo.h 2011-11-03 17:59:08.000000000 +0100 @@ -132,7 +132,6 @@ /** * Add a base url. \see baseUrls * \param url The base url for the repository. - * \note can change keepPackages,so change it after this call * * To recreate the base URLs list, use \ref setBaseUrl(const Url &) followed * by addBaseUrl(). @@ -140,7 +139,6 @@ void addBaseUrl( const Url &url ); /** * Clears current base URL list and adds \a url. - * \note can change keepPackages,so change it after this call */ void setBaseUrl( const Url &url ); @@ -269,11 +267,11 @@ void setGpgKeyUrl( const Url &gpgkey ); /** - * \short Whether to keep the packages downloaded from this repository will be kept in local cache + * \short Whether packages downloaded from this repository will be kept in local cache */ bool keepPackages() const; /** - * \short Set if the packaqes downloaded from this repository will be kept in local cache + * \short Set if packaqes downloaded from this repository will be kept in local cache * * If the setting is true, all downloaded packages from this repository will be * copied to the local raw cache. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.1/zypp/ZConfig.cc new/libzypp-10.3.2/zypp/ZConfig.cc --- old/libzypp-10.3.1/zypp/ZConfig.cc 2011-10-24 13:51:58.000000000 +0200 +++ new/libzypp-10.3.2/zypp/ZConfig.cc 2011-11-03 17:59:08.000000000 +0100 @@ -39,7 +39,15 @@ /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// - + /** \addtogroup ZyppConfig Zypp Configuration Options + * + * The global \c zypp.conf configuration file is per default located in \c /etc/zypp/. + * An alternate config file can be set using the environment varaible \c ZYPP_CONF=<PATH> + * (see \ref zypp-envars). + * + * \section ZyppConfig_ZyppConfSample Sample zypp.conf + * \include ../zypp.conf + */ /////////////////////////////////////////////////////////////////// namespace { ///////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.1/zypp/ZConfig.h new/libzypp-10.3.2/zypp/ZConfig.h --- old/libzypp-10.3.1/zypp/ZConfig.h 2011-10-24 13:51:58.000000000 +0200 +++ new/libzypp-10.3.2/zypp/ZConfig.h 2011-11-03 17:59:08.000000000 +0100 @@ -52,6 +52,7 @@ * * namespace_settingName() * + * \ingroup ZyppConfig * \ingroup Singleton */ class ZConfig : private base::NonCopyable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.1/zypp/media/MediaAccess.cc new/libzypp-10.3.2/zypp/media/MediaAccess.cc --- old/libzypp-10.3.1/zypp/media/MediaAccess.cc 2011-10-24 13:51:58.000000000 +0200 +++ new/libzypp-10.3.2/zypp/media/MediaAccess.cc 2011-11-03 17:59:08.000000000 +0100 @@ -113,7 +113,7 @@ UrlResolverPlugin::HeaderList custom_headers; Url url = UrlResolverPlugin::resolveUrl(o_url, custom_headers); - + std::string scheme = url.getScheme(); MIL << "Trying scheme '" << scheme << "'" << endl; @@ -156,7 +156,7 @@ } else { - if ( urlmediahandler.empty() ) + if ( ! urlmediahandler.empty() ) { WAR << "unknown mediahandler set: " << urlmediahandler << endl; } @@ -199,24 +199,24 @@ use_aria = false; } - MediaCurl *curl; + MediaCurl *curl; if ( use_aria ) - curl = new MediaAria2c (url,preferred_attach_point); - else if ( use_multicurl ) - curl = new MediaMultiCurl (url,preferred_attach_point); + curl = new MediaAria2c (url,preferred_attach_point); + else if ( use_multicurl ) + curl = new MediaMultiCurl (url,preferred_attach_point); else curl = new MediaCurl (url,preferred_attach_point); - + UrlResolverPlugin::HeaderList::const_iterator it; for (it = custom_headers.begin(); it != custom_headers.end(); ++it) { - std::string header = it->first + ": " + it->second; + std::string header = it->first + ": " + it->second; MIL << "Added custom header -> " << header << endl; curl->settings().addHeader(header); } - _handler = curl; + _handler = curl; } else if (scheme == "plugin" ) _handler = new MediaPlugin (url,preferred_attach_point); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
