[zypp-commit] r6000 - in /branches/REFACTORING-10_3/libzypp/zypp: RepoInfo.cc RepoInfo.h

Author: dmacvicar Date: Fri Jul 13 12:55:53 2007 New Revision: 6000 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6000&view=rev Log: Add support for gpgkey and gpgcheck hints to RepoInfo Modified: branches/REFACTORING-10_3/libzypp/zypp/RepoInfo.cc branches/REFACTORING-10_3/libzypp/zypp/RepoInfo.h Modified: branches/REFACTORING-10_3/libzypp/zypp/RepoInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/RepoInfo.cc?rev=6000&r1=5999&r2=6000&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/RepoInfo.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/RepoInfo.cc Fri Jul 13 12:55:53 2007 @@ -42,9 +42,12 @@ public: boost::tribool enabled; boost::tribool autorefresh; + boost::tribool gpgcheck; + Url gpgkey_url; repo::RepoType type; Url mirrorlist_url; std::set<Url> baseUrls; + Pathname path; std::string alias; std::string name; Pathname filepath; @@ -100,12 +103,24 @@ _pimpl->autorefresh = autorefresh; return *this; } + + RepoInfo & RepoInfo::setGpgCheck( boost::tribool check ) + { + _pimpl->gpgcheck = check; + return *this; + } RepoInfo & RepoInfo::setMirrorListUrl( const Url &url ) { _pimpl->mirrorlist_url = url; return *this; } + + RepoInfo & RepoInfo::setGpgKeyUrl( const Url &url ) + { + _pimpl->gpgkey_url = url; + return *this; + } RepoInfo & RepoInfo::addBaseUrl( const Url &url ) { @@ -120,6 +135,12 @@ return *this; } + RepoInfo & RepoInfo::setPath( const Pathname &path ) + { + _pimpl->path = path; + return *this; + } + RepoInfo & RepoInfo::setAlias( const std::string &alias ) { _pimpl->alias = alias; @@ -149,6 +170,9 @@ tribool RepoInfo::autorefresh() const { return _pimpl->autorefresh; } + + tribool RepoInfo::gpgCheck() const + { return _pimpl->gpgcheck; } std::string RepoInfo::alias() const { return _pimpl->alias; } @@ -164,10 +188,16 @@ Url RepoInfo::mirrorListUrl() const { return _pimpl->mirrorlist_url; } + + Url RepoInfo::gpgKeyUrl() const + { return _pimpl->gpgkey_url; } std::set<Url> RepoInfo::baseUrls() const { return _pimpl->baseUrls; } + Pathname RepoInfo::path() const + { return _pimpl->path; } + RepoInfo::urls_const_iterator RepoInfo::baseUrlsBegin() const { return _pimpl->baseUrls.begin(); } @@ -191,11 +221,14 @@ { str << "- url : " << *it << std::endl; } - + str << "- path : " << path() << std::endl; str << "- type : " << type() << std::endl; str << "- enabled : " << enabled() << std::endl; + str << "- autorefresh : " << autorefresh() << std::endl; - //str << "- path : " << path() << std::endl; + str << "- gpgcheck : " << gpgCheck() << std::endl; + str << "- gpgkey : " << gpgKeyUrl() << std::endl; + return str; } @@ -212,10 +245,24 @@ { str << *it << endl; } - str << "mirrorlist=" << mirrorListUrl() << endl; + + if ( ! path().empty() ) + str << "path="<< path() << endl; + + if ( ! (mirrorListUrl().asString().empty()) ) + str << "mirrorlist=" << mirrorListUrl() << endl; + str << "type=" << type().asString() << endl; - str << "enabled=" << (enabled() ? "1" : "0") << endl; - str << "autorefresh=" << (autorefresh() ? "1" : "0") << endl; + + if ( enabled() != indeterminate ) + str << "enabled=" << (enabled() ? "1" : "0") << endl; + if ( autorefresh() != indeterminate ) + str << "autorefresh=" << (autorefresh() ? "1" : "0") << endl; + if ( autorefresh() != indeterminate ) + str << "gpgcheck=" << (gpgCheck() ? "1" : "0") << endl; + if ( ! (gpgKeyUrl().asString().empty()) ) + str << "gpgkey=" <http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/RepoInfo.h?rev=6000&r1=5999&r2=6000&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/RepoInfo.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/RepoInfo.h Fri Jul 13 12:55:53 2007 @@ -92,6 +92,26 @@ std::set<Url> baseUrls() const; /** + * \short Repository path + * + * Pathname relative to the base Url where the product/repository + * is located + * + * For medias containing more than one product, or repositories not + * located at the root of the media it is important to + * know the path of the media root relative to the product directory + * so a media verifier can be set for that media. + * + * It is not mandatory, and the default is / + * + * \note As a repository can have multiple Urls, the path is unique and + * the same for all Urls, so it is assumed all the Urls have the + * same media layout. + * + */ + Pathname path() const; + + /** * Url of a file which contains a list of Urls * If empty, the base url will be used. */ @@ -154,8 +174,28 @@ * infos created in memory. */ Pathname filepath() const; + + /** + * \short Whether to check or not this repository with gpg + * + * \note This is a just a hint to the application and can + * be ignored. + * + */ + boost::tribool gpgCheck() const; /** + * \short Key to use for gpg checking of this repository + * + * \param url Url to the key in ASCII armored format + * + * \note This is a just a hint to the application and can + * be ignored. + * + */ + Url gpgKeyUrl() const; + + /** * Add a base url. \see baseUrls * \param url The base url for the repository. * @@ -170,6 +210,12 @@ RepoInfo & setBaseUrl( const Url &url ); /** + * set the product path. \see path() + * \param path the path to the product + */ + RepoInfo & setPath( const Pathname &path ); + + /** * Set mirror list url. \see mirrorListUrl * \param url The base url for the list */ @@ -212,6 +258,28 @@ RepoInfo & setFilepath( const Pathname &filename ); /** + * \short Whether to check or not this repository with gpg + * + * \param check true (check) or false (dont'check) + * + * \note This is a just a hint to the application and can + * be ignored. + * + */ + RepoInfo & setGpgCheck( boost::tribool check ); + + /** + * \short Key to use for gpg checking of this repository + * + * \param url Url to the key in ASCII armored format + * + * \note This is a just a hint to the application and can + * be ignored. + * + */ + RepoInfo & setGpgKeyUrl( const Url &gpgkey ); + + /** * Write a human-readable representation of this RepoInfo object * into the \a str stream. Useful for logging. */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org