July 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r10695 - in /trunk/libzypp: tests/zypp/ zypp/ zypp/parser/ zypp/repo/
by jkupec＠svn.opensuse.org 30 Jul '08

30 Jul '08

Author: jkupec Date: Wed Jul 30 12:42:02 2008 New Revision: 10695 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10695&view=rev Log: - Service -> ServiceInfo derived from RepoInfoBase Added: trunk/libzypp/zypp/ServiceInfo.cc (contents, props changed) - copied, changed from r10693, trunk/libzypp/zypp/Service.cc trunk/libzypp/zypp/ServiceInfo.h (contents, props changed) - copied, changed from r10693, trunk/libzypp/zypp/Service.h Removed: trunk/libzypp/zypp/Service.cc trunk/libzypp/zypp/Service.h Modified: trunk/libzypp/tests/zypp/RepoManager_test.cc trunk/libzypp/zypp/CMakeLists.txt trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/RepoManager.h trunk/libzypp/zypp/parser/RepoindexFileReader.cc trunk/libzypp/zypp/parser/ServiceFileReader.cc trunk/libzypp/zypp/parser/ServiceFileReader.h trunk/libzypp/zypp/repo/RepoInfoBase.cc trunk/libzypp/zypp/repo/RepoInfoBase.h trunk/libzypp/zypp/repo/RepoInfoBaseImpl.h Modified: trunk/libzypp/tests/zypp/RepoManager_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/RepoManager_t… ============================================================================== --- trunk/libzypp/tests/zypp/RepoManager_test.cc (original) +++ trunk/libzypp/tests/zypp/RepoManager_test.cc Wed Jul 30 12:42:02 2008 @@ -10,7 +10,7 @@ #include "zypp/PublicKey.h" #include "zypp/TmpPath.h" #include "zypp/PathInfo.h" -#include "zypp/Service.h" +#include "zypp/ServiceInfo.h" #include "zypp/RepoManager.h" @@ -40,7 +40,8 @@ RepoManager manager(opts); - list<RepoInfo> repos = manager.knownRepositories(); + list<RepoInfo> repos; + repos.insert(repos.end(), manager.repoBegin(), manager.repoEnd()); BOOST_CHECK_EQUAL(repos.size(), (unsigned) 4); // now add a .repo file with 2 repositories in it @@ -54,7 +55,8 @@ BOOST_CHECK( PathInfo(opts.knownReposPath + "/proprietary.repo_1").isExist() ); // now there should be 6 repos - repos = manager.knownRepositories(); + repos.clear(); + repos.insert(repos.end(), manager.repoBegin(), manager.repoEnd()); BOOST_CHECK_EQUAL(repos.size(), (unsigned) 6); RepoInfo office_dup; @@ -66,7 +68,8 @@ office.setAlias("office"); manager.removeRepository(office); // now there should be 5 repos - repos = manager.knownRepositories(); + repos.clear(); + repos.insert(repos.end(), manager.repoBegin(), manager.repoEnd()); BOOST_CHECK_EQUAL(repos.size(), (unsigned) 5); // the file still contained one repo, so it should still exists BOOST_CHECK( PathInfo(opts.knownReposPath + "/proprietary.repo_1").isExist() ); @@ -80,15 +83,17 @@ BOOST_CHECK( ! PathInfo(opts.knownReposPath + "/proprietary.repo_1").isExist() ); //test service + Url urlS; urlS.setPathName(DATADIR.asString()); urlS.setScheme("dir"); - Service service("test",urlS); + + ServiceInfo service("test", urlS); service.setEnabled(true); manager.addService(service); manager.refreshServices(); - BOOST_CHECK_EQUAL(manager.repoSize(), (unsigned) 7); //+3 from repoindex + BOOST_CHECK_EQUAL(manager.repoSize(), (unsigned) 7); // +3 from repoindex //simulate change of repoindex.xml urlS.setPathName((DATADIR+"second").asString()); @@ -98,12 +103,12 @@ manager.modifyService(service.alias(), service); manager.refreshServices(); - BOOST_CHECK_EQUAL(manager.repoSize(), (unsigned) 6); //-1 from new repoindex + BOOST_CHECK_EQUAL(manager.repoSize(), (unsigned) 6); // -1 from new repoindex std::list<RepoInfo> infos; manager.getRepositoriesInService("test", insert_iterator<std::list<RepoInfo> >(infos,infos.begin())); - BOOST_CHECK_EQUAL(infos.size(), 2); //2 from new repoindex + BOOST_CHECK_EQUAL(infos.size(), 2); // 2 from new repoindex // let test cache creation Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=… ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Wed Jul 30 12:42:02 2008 @@ -58,7 +58,7 @@ ResPool.cc ResPoolProxy.cc ResStatus.cc - Service.cc + ServiceInfo.cc Signature.cc SrcPackage.cc SysContent.cc @@ -150,7 +150,7 @@ ResPoolProxy.h ResStatus.h ResTraits.h - Service.h + ServiceInfo.h Signature.h SrcPackage.h SysContent.h Modified: trunk/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.cc?rev=… ============================================================================== --- trunk/libzypp/zypp/RepoManager.cc (original) +++ trunk/libzypp/zypp/RepoManager.cc Wed Jul 30 12:42:02 2008 @@ -24,7 +24,7 @@ #include "zypp/base/Regex.h" #include "zypp/PathInfo.h" #include "zypp/TmpPath.h" -#include "zypp/Service.h" +#include "zypp/ServiceInfo.h" #include "zypp/repo/RepoException.h" #include "zypp/RepoManager.h" @@ -261,19 +261,19 @@ return _nullimpl; } - void saveService( const Service& service ) const; + void saveService( const ServiceInfo & service ) const; Pathname generateNonExistingName( const Pathname &dir, const std::string &basefilename ) const; - std::string generateFilename( const RepoInfo &info ) const; - std::string generateFilename( const Service &info ) const; + std::string generateFilename( const RepoInfo & info ) const; + std::string generateFilename( const ServiceInfo & info ) const; struct ServiceCollector { ServiceCollector(ServiceSet & services_) : services(services_) {} - bool collect(Service service) { services.insert(service); return true; } + bool collect(ServiceInfo service) { services.insert(service); return true; } private: ServiceSet & services; @@ -1017,7 +1017,7 @@ return filename; } - std::string RepoManager::Impl::generateFilename( const Service &info ) const + std::string RepoManager::Impl::generateFilename( const ServiceInfo & info ) const { std::string filename = info.alias(); // replace slashes with underscores @@ -1309,17 +1309,19 @@ void RepoManager::addService( const std::string & alias, const Url & url ) { - addService( Service(alias, url) ); + addService( ServiceInfo(alias, url) ); } - void RepoManager::addService( const Service & service ) + void RepoManager::addService( const ServiceInfo & service ) { - //check if service isn't already exist - if( _pimpl->services.find(service)!= _pimpl->services.end() ) + // check if service already exists + if( _pimpl->services.find(service) != _pimpl->services.end() ) return; //FIXME ZYPP_THROW(RepoAlreadyExistsException(service.name())); //this is need to save location to correct service - const Service& savedService = *(_pimpl->services.insert( service )).first; + const ServiceInfo & savedService = *(_pimpl->services.insert( service )).first; + + cout << "adde service " << savedService.alias() << endl; _pimpl->saveService( savedService ); } @@ -1328,9 +1330,9 @@ { MIL << "Going to delete repo " << alias << endl; - const Service & service = getService( alias ); + const ServiceInfo & service = getService( alias ); - Pathname location = service.location(); + Pathname location = service.filepath(); if( location.empty() ) { ZYPP_THROW(RepoException("Can't figure where the service is stored")); @@ -1362,7 +1364,7 @@ for_(it, tmpSet.begin(), tmpSet.end()) { if( it->alias() != alias ) - it->dumpServiceOn(file); + it->dumpAsIniOn(file); } MIL << alias << " sucessfully deleted from file " << location << endl; @@ -1379,11 +1381,11 @@ } - void RepoManager::removeService( const Service & service ) + void RepoManager::removeService( const ServiceInfo & service ) { removeService(service.alias()); } - void RepoManager::Impl::saveService( const Service & service ) const + void RepoManager::Impl::saveService( const ServiceInfo & service ) const { filesystem::assert_dir( options.knownServicesPath ); @@ -1397,18 +1399,18 @@ ZYPP_THROW (Exception( "Can't open " + servfile.asString() ) ); } - service.dumpServiceOn( file ); + service.dumpAsIniOn( file ); - const_cast<Service&>(service).setLocation( servfile ); + const_cast<ServiceInfo&>(service).setFilepath( servfile ); MIL << "done" << endl; } - Service RepoManager::getService( const std::string & alias ) const + ServiceInfo RepoManager::getService( const std::string & alias ) const { for_ (it, serviceBegin(), serviceEnd()) if ( it->alias() == alias ) return *it; - return Service::noService; + return ServiceInfo::noService; } bool RepoManager::serviceEmpty() const { return _pimpl->services.empty(); } @@ -1431,7 +1433,7 @@ void RepoManager::refreshServices() { //cannot user for_, because it uses const version - for (std::set<Service>::iterator it = _pimpl->services.begin(); + for (std::set<ServiceInfo>::iterator it = _pimpl->services.begin(); it != _pimpl->services.end(); ++it) { if ( !it->enabled() ) @@ -1442,7 +1444,7 @@ } } - void RepoManager::refreshService( const Service & service ) + void RepoManager::refreshService( const ServiceInfo & service ) { //! \todo add callbacks for apps (start, end, repo removed, repo added, repo changed) @@ -1470,13 +1472,11 @@ it->setService( service.alias() ); } - // compare old and new repositories (hope not to much, if it change + // compare old and new repositories (hope not too much, if it change // then construct set and use set operation on it) - std::list<RepoInfo> oldRepos; getRepositoriesInService(service.alias(), - insert_iterator<std::list<RepoInfo> > - (oldRepos,oldRepos.begin())); + insert_iterator<std::list<RepoInfo> > (oldRepos, oldRepos.begin())); // find old to remove for_( it, oldRepos.begin(), oldRepos.end() ) @@ -1511,13 +1511,13 @@ } } - void RepoManager::modifyService(const std::string & oldAlias, const Service & service) + void RepoManager::modifyService(const std::string & oldAlias, const ServiceInfo & service) { MIL << "Going to modify service " << oldAlias << endl; - const Service& oldService = getService(oldAlias); + const ServiceInfo & oldService = getService(oldAlias); - Pathname location = oldService.location(); + Pathname location = oldService.filepath(); if( location.empty() ) { ZYPP_THROW(RepoException( @@ -1537,10 +1537,10 @@ for_(it, tmpSet.begin(), tmpSet.end()) { if( *it != oldAlias ) - it->dumpServiceOn(file); + it->dumpAsIniOn(file); } - service.dumpServiceOn(file); + service.dumpAsIniOn(file); file.close(); Modified: trunk/libzypp/zypp/RepoManager.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.h?rev=1… ============================================================================== --- trunk/libzypp/zypp/RepoManager.h (original) +++ trunk/libzypp/zypp/RepoManager.h Wed Jul 30 12:42:02 2008 @@ -29,7 +29,7 @@ /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// - class Service; //predef + class ServiceInfo; //predef /** * Parses \a repo_file and returns a list of \ref RepoInfo objects @@ -98,7 +98,7 @@ class Impl; /** service typedefs */ - typedef std::set<Service> ServiceSet; + typedef std::set<ServiceInfo> ServiceSet; typedef ServiceSet::const_iterator ServiceConstIterator; typedef ServiceSet::size_type ServiceSizeType; @@ -462,24 +462,24 @@ * * \throws FIXME RepoAlreadyExistException and as reponame is service name */ - void addService( const Service & service ); + void addService( const ServiceInfo & service ); /** * Removes service specified by its name * * \param alias unique indientifier of the service to remove * - * \throws RepoException if service is not found or file with Service cannot be deleted + * \throws RepoException if service is not found or file with ServiceInfo cannot be deleted * \throws Exception if file contain more services and rewrite file failed */ void removeService( const std::string & alias ); - void removeService( const Service & service ); + void removeService( const ServiceInfo & service ); /** * Gets true if no service is in RepoManager (so no one in specified location) * - * \return true if any Service is in RepoManager + * \return true if any ServiceInfo is in RepoManager */ bool serviceEmpty() const; @@ -492,7 +492,7 @@ /** * Iterator to first service in internal storage. - * \note Iterator is immutable, so you cannot change pointed Service + * \note Iterator is immutable, so you cannot change pointed ServiceInfo * \return Iterator to first service */ ServiceConstIterator serviceBegin() const; @@ -504,17 +504,17 @@ ServiceConstIterator serviceEnd() const; /** - * Finds Service by alias or return noService + * Finds ServiceInfo by alias or return noService * * \param alias unique identifier of service - * \return information about Service + * \return information about service */ - Service getService( const std::string & alias ) const; + ServiceInfo getService( const std::string & alias ) const; /** * Refreshes all enabled services. * - * \see refreshService(Service) + * \see refreshService(ServiceInfo) */ void refreshServices(); @@ -524,7 +524,7 @@ * \param name service structure * \throws MediaException If there's a problem downloading the repo index file. */ - void refreshService( const Service & service ); + void refreshService( const ServiceInfo & service ); /** * Modifies service file (rewrites it with new values) and underlying @@ -532,17 +532,17 @@ * * Modifications of a service can lead to rewrite of all .repo files of * contained repositories. Particularily, disabling a service (changing - * Service::enabled() from true to false) will disable all contained + * ServiceInfo::enabled() from true to false) will disable all contained * repositories. Renaming of a service will modify the "service" key * of all contained repositories. * * \param oldAlias Old alias of the service - * \param service Service object containing new data + * \param service ServiceInfo object containing new data * * \throws RepoException if sservice with oldAlias is not known * \throws Exception if have problems with files */ - void modifyService(const std::string & oldAlias, const Service & service); + void modifyService(const std::string & oldAlias, const ServiceInfo & service); private: /** Copied: trunk/libzypp/zypp/ServiceInfo.cc (from r10693, trunk/libzypp/zypp/Service.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ServiceInfo.cc?p2=t… ============================================================================== --- trunk/libzypp/zypp/Service.cc (original) +++ trunk/libzypp/zypp/ServiceInfo.cc Wed Jul 30 12:42:02 2008 @@ -6,18 +6,17 @@ | /_____||_| |_| |_| | | | \---------------------------------------------------------------------*/ -/** \file zypp/Service.cc +/** \file zypp/ServiceInfo.cc * */ -#include "zypp/Service.h" - #include <ostream> +#include <iostream> -#include "zypp/base/DefaultIntegral.h" -#include "zypp/Url.h" #include "zypp/RepoInfo.h" -#include "zypp/media/MediaManager.h" #include "zypp/parser/RepoindexFileReader.h" +#include "zypp/repo/RepoInfoBaseImpl.h" + +#include "zypp/ServiceInfo.h" using namespace std; @@ -29,26 +28,26 @@ struct RepoInfoCollector { vector<RepoInfo> repos; - bool collect(const RepoInfo& info) + bool collect(const RepoInfo & info) { repos.push_back(info); return true; } }; - - class Service::Impl + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : ServiceInfo::Impl + // + struct ServiceInfo::Impl : public repo::RepoInfoBase::Impl { public: - string alias; - string name; Url url; - DefaultIntegral<bool,false> enabled; - Pathname loc; - Impl() {} - Impl(const string & alias_) : alias(alias_) {} - Impl(const string & alias_, const Url& url_) : alias(alias_), url(url_) {} + public: + Impl() : repo::RepoInfoBase::Impl() {} + + Impl(const Url & url_) : url(url_) {} private: friend Impl * rwcowClone<Impl>( const Impl * rhs ); @@ -57,52 +56,39 @@ Impl * clone() const { return new Impl( *this ); } }; + /////////////////////////////////////////////////////////////////// - const Service Service::noService; - - Service::Service() : _pimpl( new Impl() ) {} - - Service::Service(const string & alias) : _pimpl( new Impl(alias) ) {} - Service::Service(const string & alias, const Url & url) - : _pimpl( new Impl(alias, url) ) {} + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : ServiceInfo::Impl + // + /////////////////////////////////////////////////////////////////// + const ServiceInfo ServiceInfo::noService; + + ServiceInfo::ServiceInfo() : _pimpl( new Impl() ) {} - string Service::alias() const { return _pimpl->alias; } - void Service::setAlias( const std::string & alias ) { _pimpl->alias = alias; } + ServiceInfo::ServiceInfo(const string & alias) + : repo::RepoInfoBase(alias), _pimpl( new Impl() ) + {} - string Service::name() const - { if (_pimpl->name.empty()) return _pimpl->alias; return _pimpl->name; } - void Service::setName( const std::string& name ) { _pimpl->name = name; } + ServiceInfo::ServiceInfo(const string & alias, const Url & url) + : repo::RepoInfoBase(alias), _pimpl( new Impl(url) ) + {} - Url Service::url() const { return _pimpl->url; } - void Service::setUrl( const Url& url ) { _pimpl->url = url; } + Url ServiceInfo::url() const { return _pimpl->url; } + void ServiceInfo::setUrl( const Url& url ) { _pimpl->url = url; } - bool Service::enabled() const { return _pimpl->enabled; } - void Service::setEnabled( const bool enabled ) { _pimpl->enabled = enabled; } - - void Service::dumpServiceOn( std::ostream& str ) const - { - str << "[" << alias() << "]" << endl; - str << "name = " << name() << endl; - str << "url = " << url() << endl; - str << "enabled = " << ( enabled() ? "1" : "0") << endl; - } - - Pathname Service::location() const - { - return _pimpl->loc; - } - void Service::setLocation( const Pathname& location ) + std::ostream & ServiceInfo::dumpAsIniOn( std::ostream & str ) const { - _pimpl->loc = location; + return RepoInfoBase::dumpAsIniOn(str) << "url = " << url() << endl; } - std::ostream & operator<<( std::ostream& str, const Service &obj ) + std::ostream & operator<<( std::ostream& str, const ServiceInfo &obj ) { - obj.dumpServiceOn(str); - return str; + return obj.dumpAsIniOn(str); } Copied: trunk/libzypp/zypp/ServiceInfo.h (from r10693, trunk/libzypp/zypp/Service.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ServiceInfo.h?p2=tr… ============================================================================== --- trunk/libzypp/zypp/Service.h (original) +++ trunk/libzypp/zypp/ServiceInfo.h Wed Jul 30 12:42:02 2008 @@ -6,16 +6,17 @@ | /_____||_| |_| |_| | | | \---------------------------------------------------------------------*/ -/** \file zypp/Service.h +/** \file zypp/ServiceInfo.h * -*/ + */ #ifndef ZYPP_SERVICE_H #define ZYPP_SERVICE_H #include <string> #include "zypp/Url.h" -#include "zypp/Pathname.h" + +#include "zypp/repo/RepoInfoBase.h" /////////////////////////////////////////////////////////////////// @@ -24,48 +25,35 @@ /////////////////////////////////////////////////////////////////// // - // CLASS NAME : Service + // CLASS NAME : ServiceInfo // /** */ - class Service + class ServiceInfo : public repo::RepoInfoBase { public: /** Default ctor creates \ref noService.*/ - Service(); + ServiceInfo(); /** - * Service with this name. + * Creates ServiceInfo with specified alias. * - * \param name unique name of service + * \param alias unique short name of service */ - Service( const std::string& name ); + ServiceInfo( const std::string & alias ); /** - * Service with name and its URL + * ServiceInfo with alias and its URL * - * \param name unique name of service + * \param alias unique shortname of service * \param url url to service */ - Service( const std::string& name, const Url& url ); + ServiceInfo( const std::string & alias, const Url& url ); public: - /** Represents no \ref Service. */ - static const Service noService; + /** Represents an empty service. */ + static const ServiceInfo noService; public: - /** - * Gets unique alias. - * - * \return alias as string - */ - std::string alias() const; - - /** - * Gets unique name - * - * \return name of service - */ - std::string name() const; /** * Gets url to service @@ -74,42 +62,8 @@ */ Url url() const; - /** - * Returns 'enabled' flag of the services. - * - * Disabled services imply disabled repositories of these services - * and they won't be refreshed by \ref RepoManager::refreshServices(). - * - * Enabled services will be refreshed by \ref RepoManager::refreshServices(). - */ - bool enabled() const; - - /** - * Gets from which file is this service loaded or saved. - * - * \note this is empty for newly created file until it is saved - * \return path to file storing this service - */ - Pathname location() const; - public: - /** - * Sets alias for this service - * - * \param alias new alias of this service - */ - void setAlias( const std::string & alias ); - - /** - * Sets file where this service is stored. - * - * \warning don't use this function, only parses and serializer can - * use it - * \param location path where service is stored - */ - void setLocation( const Pathname& location ); - /** * Sets url for this service * @@ -117,26 +71,13 @@ */ void setUrl( const Url& url ); - /** - * Sets name for this service - * - * \param name new name of this service - */ - void setName( const std::string& name ); - - /** - * Sets enabled status of the services. - * \param enabled The desired status. - */ - void setEnabled( const bool enabled ); - public: /** - * Writes Service to stream in ".service" format + * Writes ServiceInfo to stream in ".service" format * * \param str stream where serialized version service is written */ - void dumpServiceOn( std::ostream & str ) const; + virtual std::ostream & dumpAsIniOn( std::ostream & str ) const; class Impl; @@ -145,20 +86,20 @@ }; /////////////////////////////////////////////////////////////////// - /** \relates Service Stream output */ - std::ostream & operator<<( std::ostream & str, const Service & obj ); + /** \relates ServiceInfo Stream output */ + std::ostream & operator<<( std::ostream & str, const ServiceInfo & obj ); - /** \relates Service */ - inline bool operator==( const Service & lhs, const Service & rhs ) - { return lhs.name() == rhs.name(); } - - /** \relates Service */ - inline bool operator!=( const Service & lhs, const Service & rhs ) - { return lhs.name() != rhs.name(); } - - /** \relates Service */ - inline bool operator<( const Service & lhs, const Service & rhs ) - { return lhs.name() < rhs.name(); } + /** \relates ServiceInfo */ + inline bool operator==( const ServiceInfo & lhs, const ServiceInfo & rhs ) + { return lhs.alias() == rhs.alias(); } + + /** \relates ServiceInfo */ + inline bool operator!=( const ServiceInfo & lhs, const ServiceInfo & rhs ) + { return lhs.alias() != rhs.alias(); } + + /** \relates ServiceInfo */ + inline bool operator<( const ServiceInfo & lhs, const ServiceInfo & rhs ) + { return lhs.alias() < rhs.alias(); } ///////////////////////////////////////////////////////////////// } // namespace zypp Modified: trunk/libzypp/zypp/parser/RepoindexFileReader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/RepoindexFil… ============================================================================== --- trunk/libzypp/zypp/parser/RepoindexFileReader.cc (original) +++ trunk/libzypp/zypp/parser/RepoindexFileReader.cc Wed Jul 30 12:42:02 2008 @@ -100,9 +100,9 @@ info.setAlias(reader_r->getAttribute("alias").asString()); info.setType(repo::RepoType::RPMMD_e); //TODO hardwired rpmmd??? XmlString s = reader_r->getAttribute("name"); - if (s.get()) //name setted so also set it + if (s.get()) // name available so store it info.setName(s.asString()); - //ignore rest + // ignore the rest _callback(info); return true; } Modified: trunk/libzypp/zypp/parser/ServiceFileReader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/ServiceFileR… ============================================================================== --- trunk/libzypp/zypp/parser/ServiceFileReader.cc (original) +++ trunk/libzypp/zypp/parser/ServiceFileReader.cc Wed Jul 30 12:42:02 2008 @@ -17,7 +17,7 @@ #include "zypp/parser/IniDict.h" #include "zypp/parser/ServiceFileReader.h" -#include "zypp/Service.h" +#include "zypp/ServiceInfo.h" using std::endl; using zypp::parser::IniDict; @@ -36,8 +36,8 @@ const ServiceFileReader::ProcessService & callback ); }; - void ServiceFileReader::Impl::parseServices( const Pathname &file, - const ServiceFileReader::ProcessService &callback/*, + void ServiceFileReader::Impl::parseServices( const Pathname & file, + const ServiceFileReader::ProcessService & callback/*, const ProgressData::ReceiverFnc &progress*/ ) { InputStream is(file); @@ -53,7 +53,7 @@ { MIL << (*its) << endl; - Service service(*its); + ServiceInfo service(*its); for ( IniDict::entry_const_iterator it = dict.entriesBegin(*its); it != dict.entriesEnd(*its); @@ -66,12 +66,14 @@ service.setUrl( Url (it->second) ); else if ( it->first == "enabled" ) service.setEnabled( str::strToTrue( it->second ) ); + else if ( it->first == "autorefresh" ) + service.setAutorefresh( str::strToTrue( it->second ) ); else ERR << "Unknown attribute " << it->second << " ignored" << endl; } - MIL << "Linking Service with file " << file << endl; - service.setLocation(file); + MIL << "Linking ServiceInfo with file " << file << endl; + service.setFilepath(file); // add it to the list. if ( !callback(service) ) Modified: trunk/libzypp/zypp/parser/ServiceFileReader.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/ServiceFileR… ============================================================================== --- trunk/libzypp/zypp/parser/ServiceFileReader.h (original) +++ trunk/libzypp/zypp/parser/ServiceFileReader.h Wed Jul 30 12:42:02 2008 @@ -22,7 +22,7 @@ namespace zypp { ///////////////////////////////////////////////////////////////// - class Service; + class ServiceInfo; /////////////////////////////////////////////////////////////////// namespace parser { ///////////////////////////////////////////////////////////////// @@ -30,7 +30,7 @@ /** * \short Read service data from a .service file * - * After each service is read, a \ref Service is prepared and \ref _callback + * After each service is read, a \ref ServiceInfo is prepared and \ref _callback * is called with the object passed in. * * The \ref _callback is provided on construction. @@ -47,12 +47,12 @@ /** * Callback definition. - * First parameter is a \ref Service object with the resource. + * First parameter is a \ref ServiceInfo object with the resource. * * Return false from the callback to get a \ref AbortRequestException * to be thrown and the processing to be cancelled. */ - typedef function< bool( const Service & )> ProcessService; + typedef function< bool( const ServiceInfo & )> ProcessService; /** Implementation */ class Impl; Modified: trunk/libzypp/zypp/repo/RepoInfoBase.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepoInfoBase.c… ============================================================================== --- trunk/libzypp/zypp/repo/RepoInfoBase.cc (original) +++ trunk/libzypp/zypp/repo/RepoInfoBase.cc Wed Jul 30 12:42:02 2008 @@ -25,6 +25,11 @@ namespace repo { ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : RepoInfoBase::Impl + // + /////////////////////////////////////////////////////////////////// /** \relates RepoInfo::Impl Stream output */ inline std::ostream & operator<<( std::ostream & str, const RepoInfoBase::Impl & obj ) @@ -32,6 +37,22 @@ return str << "RepoInfo::Impl"; } + void RepoInfoBase::Impl::setAlias(const string & alias_) + { + this->alias = alias_; + // replace slashes with underscores + std::string fnd="/"; + std::string rep="_"; + std::string escaped_alias = alias_; + size_t pos = escaped_alias.find(fnd); + while (pos != string::npos) + { + escaped_alias.replace(pos, fnd.length(), rep); + pos = escaped_alias.find(fnd, pos+rep.length()); + } + this->escaped_alias = escaped_alias; + } + /////////////////////////////////////////////////////////////////// // // CLASS NAME : RepoInfoBase @@ -40,11 +61,20 @@ /////////////////////////////////////////////////////////////////// // - // METHOD NAME : RepoInfo::RepoInfo + // METHOD NAME : RepoInfoBase::RepoInfoBase // METHOD TYPE : Ctor // RepoInfoBase::RepoInfoBase() - : _pimpl( new Impl() ) + : _pimpl( new Impl() ) + {} + + /////////////////////////////////////////////////////////////////// + // + // METHOD NAME : RepoInfoBase::RepoInfoBase + // METHOD TYPE : Ctor + // + RepoInfoBase::RepoInfoBase(const string & alias) + : _pimpl( new Impl(alias) ) {} /////////////////////////////////////////////////////////////////// @@ -69,18 +99,7 @@ RepoInfoBase & RepoInfoBase::setAlias( const std::string &alias ) { - _pimpl->alias = alias; - // replace slashes with underscores - std::string fnd="/"; - std::string rep="_"; - std::string escaped_alias = alias; - size_t pos = escaped_alias.find(fnd); - while(pos!=string::npos) - { - escaped_alias.replace(pos,fnd.length(),rep); - pos = escaped_alias.find(fnd,pos+rep.length()); - } - _pimpl->escaped_alias = escaped_alias; + _pimpl->setAlias(alias); return *this; } @@ -151,6 +170,7 @@ { return obj.dumpOn(str); } + /////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////// } // namespace repo Modified: trunk/libzypp/zypp/repo/RepoInfoBase.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepoInfoBase.h… ============================================================================== --- trunk/libzypp/zypp/repo/RepoInfoBase.h (original) +++ trunk/libzypp/zypp/repo/RepoInfoBase.h Wed Jul 30 12:42:02 2008 @@ -40,6 +40,7 @@ public: RepoInfoBase(); + RepoInfoBase(const std::string & alias); ~RepoInfoBase(); /** Modified: trunk/libzypp/zypp/repo/RepoInfoBaseImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepoInfoBaseIm… ============================================================================== --- trunk/libzypp/zypp/repo/RepoInfoBaseImpl.h (original) +++ trunk/libzypp/zypp/repo/RepoInfoBaseImpl.h Wed Jul 30 12:42:02 2008 @@ -35,6 +35,11 @@ , autorefresh (indeterminate) {} + Impl(const std::string & alias_) + : enabled(indeterminate) + , autorefresh(indeterminate) + { setAlias(alias_); } + ~Impl() {} @@ -47,6 +52,8 @@ Pathname filepath; public: + void setAlias(const std::string & alias_); + private: friend Impl * rwcowClone<Impl>( const Impl * rhs ); /** clone for RWCOW_pointer */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10694 - /trunk/libzypp/zypp/ZYppFactory.cc
by lslezak＠svn.opensuse.org 30 Jul '08

30 Jul '08

Author: lslezak Date: Wed Jul 30 11:51:21 2008 New Revision: 10694 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10694&view=rev Log: - use newline separator in ZYppFactoryException message so it can be displayed in a popup window in GUI Modified: trunk/libzypp/zypp/ZYppFactory.cc Modified: trunk/libzypp/zypp/ZYppFactory.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZYppFactory.cc?rev=… ============================================================================== --- trunk/libzypp/zypp/ZYppFactory.cc (original) +++ trunk/libzypp/zypp/ZYppFactory.cc Wed Jul 30 11:51:21 2008 @@ -358,7 +358,7 @@ /*--------------------------------------------------*/ if ( globalLock.zyppLocked() ) { - std::string t = str::form(N_("System management is locked by the application with pid %d (%s). " + std::string t = str::form(N_("System management is locked by the application with pid %d (%s).\n" "Please close this application before trying again."), globalLock.locker_pid(), globalLock.locker_name().c_str() -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10693 - /trunk/libzypp-testsuite/solver/src/deptestomatic.cc
by jkupec＠svn.opensuse.org 29 Jul '08

29 Jul '08

Author: jkupec Date: Tue Jul 29 18:12:28 2008 New Revision: 10693 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10693&view=rev Log: - fix to compile Modified: trunk/libzypp-testsuite/solver/src/deptestomatic.cc Modified: trunk/libzypp-testsuite/solver/src/deptestomatic.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/src/dep… ============================================================================== --- trunk/libzypp-testsuite/solver/src/deptestomatic.cc (original) +++ trunk/libzypp-testsuite/solver/src/deptestomatic.cc Tue Jul 29 18:12:28 2008 @@ -615,8 +615,8 @@ .setAlias ( alias ) .setName ( "namen sind schall und rauch" ) .setEnabled ( true ) - .setAutorefresh( false ) - .addBaseUrl ( Url(filename) ); + .setAutorefresh( false ); + nrepo.addBaseUrl ( Url(filename) ); //manager.addRepository( nrepo ); manager.refreshMetadata( nrepo ); @@ -647,8 +647,8 @@ .setAlias ( alias ) .setName ( "namen sind schall und rauch" ) .setEnabled ( true ) - .setAutorefresh( false ) - .addBaseUrl ( pathname.asUrl() ); + .setAutorefresh( false ); + nrepo.addBaseUrl ( pathname.asUrl() ); satRepo.setInfo (nrepo); _Repo *intSatRepo = satRepo.get(); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10692 - /trunk/libzypp/zypp/repo/RepoInfoBase.cc
by jkupec＠svn.opensuse.org 29 Jul '08

29 Jul '08

Author: jkupec Date: Tue Jul 29 17:57:34 2008 New Revision: 10692 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10692&view=rev Log: - reenable variable replacement in RepoInfoBase::name() Modified: trunk/libzypp/zypp/repo/RepoInfoBase.cc Modified: trunk/libzypp/zypp/repo/RepoInfoBase.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepoInfoBase.c… ============================================================================== --- trunk/libzypp/zypp/repo/RepoInfoBase.cc (original) +++ trunk/libzypp/zypp/repo/RepoInfoBase.cc Tue Jul 29 17:57:34 2008 @@ -11,6 +11,8 @@ */ #include <iostream> +#include "zypp/repo/RepoVariables.h" + #include "zypp/repo/RepoInfoBase.h" #include "zypp/repo/RepoInfoBaseImpl.h" @@ -115,8 +117,8 @@ return alias(); } - //! \todo repo::RepoVariablesStringReplacer replacer; - return _pimpl->name; //replacer(_pimpl->name); + repo::RepoVariablesStringReplacer replacer; + return replacer(_pimpl->name); } Pathname RepoInfoBase::filepath() const -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10691 - in /trunk/libzypp/zypp: CMakeLists.txt RepoInfo.cc RepoInfo.h repo/RepoInfoBase.cc repo/RepoInfoBase.h repo/RepoInfoBaseImpl.h sat/Pool.cc
by jkupec＠svn.opensuse.org 29 Jul '08

29 Jul '08

Author: jkupec Date: Tue Jul 29 17:54:30 2008 New Revision: 10691 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10691&view=rev Log: - RepoInfoBase added for common SericeInfo and RepoInfo stuff Added: trunk/libzypp/zypp/repo/RepoInfoBase.cc trunk/libzypp/zypp/repo/RepoInfoBase.h trunk/libzypp/zypp/repo/RepoInfoBaseImpl.h Modified: trunk/libzypp/zypp/CMakeLists.txt trunk/libzypp/zypp/RepoInfo.cc trunk/libzypp/zypp/RepoInfo.h trunk/libzypp/zypp/sat/Pool.cc Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=… ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Tue Jul 29 17:54:30 2008 @@ -705,6 +705,7 @@ repo/MediaInfoDownloader.cc repo/Downloader.cc repo/RepoVariables.cc + repo/RepoInfoBase.cc ) SET( zypp_repo_HEADERS @@ -720,6 +721,8 @@ repo/MediaInfoDownloader.h repo/Downloader.h repo/RepoVariables.h + repo/RepoInfoBase.h + repo/RepoInfoBaseImpl.h ) INSTALL( FILES Modified: trunk/libzypp/zypp/RepoInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.cc?rev=106… ============================================================================== --- trunk/libzypp/zypp/RepoInfo.cc (original) +++ trunk/libzypp/zypp/RepoInfo.cc Tue Jul 29 17:54:30 2008 @@ -16,6 +16,7 @@ #include "zypp/media/MediaAccess.h" #include "zypp/RepoInfo.h" +#include "zypp/repo/RepoInfoBaseImpl.h" using namespace std; @@ -28,29 +29,18 @@ // CLASS NAME : RepoInfo::Impl // /** RepoInfo implementation. */ - struct RepoInfo::Impl + struct RepoInfo::Impl : public repo::RepoInfoBase::Impl { - enum FlagsDeterminedState - { - FLAG_ENABLED = 1, - FLAG_AUTOREFRESH = 2, - FLAG_GPGCHECK = 4, - FLAG_KEEPPACKAGES = 8 - }; - Impl() - : enabled (false), - autorefresh(false), - gpgcheck(true), - keeppackages(false), - type(repo::RepoType::NONE_e), - flags_determined(0) + : repo::RepoInfoBase::Impl() + , gpgcheck(indeterminate) + , keeppackages(indeterminate) + , type(repo::RepoType::NONE_e) {} ~Impl() - { - //MIL << std::endl; - } + {} + public: static const unsigned defaultPriority = 99; @@ -65,24 +55,17 @@ } public: - bool enabled; - bool autorefresh; - bool gpgcheck; - bool keeppackages; + TriBool gpgcheck; + TriBool keeppackages; Url gpgkey_url; repo::RepoType type; Url mirrorlist_url; std::set<Url> baseUrls; Pathname path; - std::string alias; - std::string escaped_alias; - std::string name; std::string service; - Pathname filepath; Pathname metadatapath; Pathname packagespath; DefaultIntegral<unsigned,defaultPriority> priority; - int flags_determined; public: private: @@ -134,25 +117,9 @@ return *this; } - - RepoInfo & RepoInfo::setEnabled( bool enabled ) - { - _pimpl->enabled = enabled; - _pimpl->flags_determined |= Impl::FLAG_ENABLED; - return *this; - } - - RepoInfo & RepoInfo::setAutorefresh( bool autorefresh ) - { - _pimpl->autorefresh = autorefresh; - _pimpl->flags_determined |= Impl::FLAG_AUTOREFRESH; - return *this; - } - RepoInfo & RepoInfo::setGpgCheck( bool check ) { _pimpl->gpgcheck = check; - _pimpl->flags_determined |= Impl::FLAG_GPGCHECK; return *this; } @@ -170,18 +137,6 @@ RepoInfo & RepoInfo::addBaseUrl( const Url &url ) { - // set only if not already set externally (bnc #394728) - if (!(_pimpl->flags_determined & Impl::FLAG_KEEPPACKAGES) && - _pimpl->baseUrls.empty()) - { - if ( media::MediaAccess::downloads( url ) ) - // don't do this via setKeepPackages, it would set the flags_determined - // for FLAG_KEEPPACKAGES - _pimpl->keeppackages = true; - else - _pimpl->keeppackages = false; - } - _pimpl->baseUrls.insert(url); return *this; } @@ -199,23 +154,6 @@ return *this; } - RepoInfo & RepoInfo::setAlias( const std::string &alias ) - { - _pimpl->alias = alias; - // replace slashes with underscores - std::string fnd="/"; - std::string rep="_"; - std::string escaped_alias = alias; - size_t pos = escaped_alias.find(fnd); - while(pos!=string::npos) - { - escaped_alias.replace(pos,fnd.length(),rep); - pos = escaped_alias.find(fnd,pos+rep.length()); - } - _pimpl->escaped_alias = escaped_alias; - return *this; - } - RepoInfo & RepoInfo::setType( const repo::RepoType &t ) { _pimpl->type = t; @@ -225,17 +163,6 @@ void RepoInfo::setProbedType( const repo::RepoType &t ) const { _pimpl->setProbedType( t ); } - RepoInfo & RepoInfo::setName( const std::string &name ) - { - _pimpl->name = name; - return *this; - } - - RepoInfo & RepoInfo::setFilepath( const Pathname &filepath ) - { - _pimpl->filepath = filepath; - return *this; - } RepoInfo & RepoInfo::setMetadataPath( const Pathname &path ) { @@ -252,7 +179,6 @@ RepoInfo & RepoInfo::setKeepPackages( bool keep ) { _pimpl->keeppackages = keep; - _pimpl->flags_determined |= Impl::FLAG_KEEPPACKAGES; return *this; } @@ -262,34 +188,8 @@ return *this; } - bool RepoInfo::enabled() const - { return _pimpl->enabled; } - - bool RepoInfo::autorefresh() const - { return _pimpl->autorefresh; } - bool RepoInfo::gpgCheck() const - { return _pimpl->gpgcheck; } - - std::string RepoInfo::alias() const - { return _pimpl->alias; } - - std::string RepoInfo::escaped_alias() const - { return _pimpl->escaped_alias; } - - std::string RepoInfo::name() const - { - if ( _pimpl->name.empty() ) - { - return alias(); - } - - repo::RepoVariablesStringReplacer replacer; - return replacer(_pimpl->name); - } - - Pathname RepoInfo::filepath() const - { return _pimpl->filepath; } + { return indeterminate(_pimpl->gpgcheck) ? true : (bool) _pimpl->gpgcheck; } Pathname RepoInfo::metadataPath() const { return _pimpl->metadatapath; } @@ -347,13 +247,26 @@ bool RepoInfo::baseUrlsEmpty() const { return _pimpl->baseUrls.empty(); } + // false by default (if not set by setKeepPackages) bool RepoInfo::keepPackages() const - { return _pimpl->keeppackages; } + { + if (indeterminate(_pimpl->keeppackages)) + { + if (_pimpl->baseUrls.empty()) + return false; + else if ( media::MediaAccess::downloads( *baseUrlsBegin() ) ) + return true; + else + return false; + } + + return (bool) _pimpl->keeppackages; + } + std::ostream & RepoInfo::dumpOn( std::ostream & str ) const { - str << "--------------------------------------" << std::endl; - str << "- alias : " << alias() << std::endl; + RepoInfoBase::dumpOn(str); for ( urls_const_iterator it = baseUrlsBegin(); it != baseUrlsEnd(); ++it ) @@ -362,10 +275,8 @@ } str << "- path : " << path() << std::endl; str << "- type : " << type() << std::endl; - str << "- enabled : " << enabled() << std::endl; str << "- priority : " << priority() << std::endl; - str << "- autorefresh : " << autorefresh() << std::endl; str << "- gpgcheck : " << gpgCheck() << std::endl; str << "- gpgkey : " << gpgKeyUrl() << std::endl; str << "- keeppackages: " << keepPackages() << std::endl; @@ -376,9 +287,7 @@ std::ostream & RepoInfo::dumpRepoOn( std::ostream & str ) const { - // we save the original data without variable replacement - str << "[" << alias() << "]" << endl; - str << "name=" << _pimpl->name << endl; + RepoInfoBase::dumpAsIniOn(str); if ( ! _pimpl->baseUrls.empty() ) str << "baseurl="; @@ -396,17 +305,17 @@ str << "mirrorlist=" << _pimpl->mirrorlist_url << endl; str << "type=" << type().asString() << endl; - str << "enabled=" << (enabled() ? "1" : "0") << endl; if ( priority() != defaultPriority() ) str << "priority=" << priority() << endl; - str << "autorefresh=" << (autorefresh() ? "1" : "0") << endl; - str << "gpgcheck=" << (gpgCheck() ? "1" : "0") << endl; + if (!indeterminate(_pimpl->gpgcheck)) + str << "gpgcheck=" << (gpgCheck() ? "1" : "0") << endl; if ( ! (gpgKeyUrl().asString().empty()) ) str << "gpgkey=" <<gpgKeyUrl() << endl; - str << "keeppackages=" << keepPackages() << endl; + if (!indeterminate(_pimpl->keeppackages)) + str << "keeppackages=" << keepPackages() << endl; if( ! service().empty() ) str << "service=" << service() << endl; Modified: trunk/libzypp/zypp/RepoInfo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.h?rev=1069… ============================================================================== --- trunk/libzypp/zypp/RepoInfo.h (original) +++ trunk/libzypp/zypp/RepoInfo.h Tue Jul 29 17:54:30 2008 @@ -12,18 +12,18 @@ #ifndef ZYPP2_REPOSITORYINFO_H #define ZYPP2_REPOSITORYINFO_H -#include <iosfwd> #include <list> #include <set> -#include "zypp/base/PtrTypes.h" + #include "zypp/base/Iterator.h" #include "zypp/base/Deprecated.h" -#include "zypp/Pathname.h" #include "zypp/Url.h" #include "zypp/repo/RepoType.h" #include "zypp/repo/RepoVariables.h" +#include "zypp/repo/RepoInfoBase.h" + /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// @@ -62,7 +62,7 @@ * \note A RepoInfo is a hint about how * to create a Repository. */ - class RepoInfo + class RepoInfo : public repo::RepoInfoBase { friend std::ostream & operator<<( std::ostream & str, const RepoInfo & obj ); @@ -74,20 +74,6 @@ ~RepoInfo(); /** - * unique identifier for this source. If not specified - * It should be generated from the base url. - * - * Normally, in a .repo file the section name is used - * ( [somerepo] ) - */ - std::string alias() const; - - /** - * Same as alias(), just escaped in a way to be a valid file name. - */ - std::string escaped_alias() const; - - /** * Repository priority for solver. * Some number between \c 1 (highest priority) and \c 99 (\ref defaultPriority). */ @@ -165,18 +151,6 @@ */ bool baseUrlsEmpty() const; - /** - * If enabled is false, then this repository must be ignored as if does - * not exists, except when checking for duplicate alias. - */ - bool enabled() const; - - /** - * If true, the repostory must be refreshed before creating resolvables - * from it - */ - bool autorefresh() const; - /** * Type of repository, * @@ -184,23 +158,6 @@ repo::RepoType type() const; /** - * \short Repository short label - * - * Short label or description of the repository, to be used on - * the user interface. - * ie: "SUSE Linux 10.2 updates" - */ - std::string name() const; - - /** - * \short File where this repo was read from - * - * \note could be an empty pathname for repo - * infos created in memory. - */ - Pathname filepath() const; - - /** * \short Path where this repo metadata was read from * * \note could be an empty pathname for repo @@ -208,12 +165,12 @@ */ Pathname metadataPath() const; - /** + /** * \short Path where this repo packages are cached */ Pathname packagesPath() const; - /** + /** * \short Whether to check or not this repository with gpg * * \note This is a just a hint to the application and can @@ -274,24 +231,6 @@ RepoInfo & setMirrorListUrl( const Url &url ); /** - * enable or disable the repository \see enabled - * \param enabled - */ - RepoInfo & setEnabled( bool enabled ); - - /** - * enable or disable autorefresh \see autorefresh - * \param enabled - */ - RepoInfo & setAutorefresh( bool autorefresh ); - - /** - * set the repository alias \see alias - * \param alias - */ - RepoInfo & setAlias( const std::string &alias ); - - /** * set the repository type \see type * \param t */ @@ -306,22 +245,6 @@ void setProbedType( const repo::RepoType &t ) const; /** - * set the repository name \see name - * \param name - */ - RepoInfo & setName( const std::string &name ); - - /** - * \short set the path to the .repo file - * - * The path to the .repo file where this repository - * was defined, or empty if nowhere. - * - * \param path File path - */ - RepoInfo & setFilepath( const Pathname &filename ); - - /** * \short set the path where the local metadata is stored * * The path to the metadata of this repository @@ -380,12 +303,12 @@ * Write a human-readable representation of this RepoInfo object * into the \a str stream. Useful for logging. */ - std::ostream & dumpOn( std::ostream & str ) const; + virtual std::ostream & dumpOn( std::ostream & str ) const; /** * Write this RepoInfo object into \a str in a <tr>.repo</tt> file format. */ - std::ostream & dumpRepoOn( std::ostream & str ) const; + virtual std::ostream & dumpRepoOn( std::ostream & str ) const; class Impl; private: Added: trunk/libzypp/zypp/repo/RepoInfoBase.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepoInfoBase.c… ============================================================================== --- trunk/libzypp/zypp/repo/RepoInfoBase.cc (added) +++ trunk/libzypp/zypp/repo/RepoInfoBase.cc Tue Jul 29 17:54:30 2008 @@ -0,0 +1,158 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/repo/RepoInfoBase.cc + * + */ +#include <iostream> + +#include "zypp/repo/RepoInfoBase.h" +#include "zypp/repo/RepoInfoBaseImpl.h" + +using namespace std; + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + namespace repo + { ///////////////////////////////////////////////////////////////// + + + /** \relates RepoInfo::Impl Stream output */ + inline std::ostream & operator<<( std::ostream & str, const RepoInfoBase::Impl & obj ) + { + return str << "RepoInfo::Impl"; + } + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : RepoInfoBase + // + /////////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // METHOD NAME : RepoInfo::RepoInfo + // METHOD TYPE : Ctor + // + RepoInfoBase::RepoInfoBase() + : _pimpl( new Impl() ) + {} + + /////////////////////////////////////////////////////////////////// + // + // METHOD NAME : RepoInfoBase::~RepoInfoBase + // METHOD TYPE : Dtor + // + RepoInfoBase::~RepoInfoBase() + {} + + RepoInfoBase & RepoInfoBase::setEnabled( bool enabled ) + { + _pimpl->enabled = enabled; + return *this; + } + + RepoInfoBase & RepoInfoBase::setAutorefresh( bool autorefresh ) + { + _pimpl->autorefresh = autorefresh; + return *this; + } + + RepoInfoBase & RepoInfoBase::setAlias( const std::string &alias ) + { + _pimpl->alias = alias; + // replace slashes with underscores + std::string fnd="/"; + std::string rep="_"; + std::string escaped_alias = alias; + size_t pos = escaped_alias.find(fnd); + while(pos!=string::npos) + { + escaped_alias.replace(pos,fnd.length(),rep); + pos = escaped_alias.find(fnd,pos+rep.length()); + } + _pimpl->escaped_alias = escaped_alias; + return *this; + } + + RepoInfoBase & RepoInfoBase::setName( const std::string &name ) + { + _pimpl->name = name; + return *this; + } + + RepoInfoBase & RepoInfoBase::setFilepath( const Pathname &filepath ) + { + _pimpl->filepath = filepath; + return *this; + } + + // true by default (if not set by setEnabled()) + bool RepoInfoBase::enabled() const + { return indeterminate(_pimpl->enabled) ? true : (bool) _pimpl->enabled; } + + // false by default (if not set by setAutorefresh()) + bool RepoInfoBase::autorefresh() const + { return indeterminate(_pimpl->autorefresh) ? false : (bool) _pimpl->autorefresh; } + + std::string RepoInfoBase::alias() const + { return _pimpl->alias; } + + std::string RepoInfoBase::escaped_alias() const + { return _pimpl->escaped_alias; } + + std::string RepoInfoBase::name() const + { + if ( _pimpl->name.empty() ) + { + return alias(); + } + + //! \todo repo::RepoVariablesStringReplacer replacer; + return _pimpl->name; //replacer(_pimpl->name); + } + + Pathname RepoInfoBase::filepath() const + { return _pimpl->filepath; } + + + std::ostream & RepoInfoBase::dumpOn( std::ostream & str ) const + { + str << "--------------------------------------" << std::endl; + str << "- alias : " << alias() << std::endl; + str << "- alias : " << name() << std::endl; + str << "- enabled : " << enabled() << std::endl; + str << "- autorefresh : " << autorefresh() << std::endl; + + return str; + } + + std::ostream & RepoInfoBase::dumpAsIniOn( std::ostream & str ) const + { + // we save the original data without variable replacement + str << "[" << alias() << "]" << endl; + str << "name=" << name() << endl; + str << "enabled=" << (enabled() ? "1" : "0") << endl; + str << "autorefresh=" << (autorefresh() ? "1" : "0") << endl; + + return str; + } + + std::ostream & operator<<( std::ostream & str, const RepoInfoBase & obj ) + { + return obj.dumpOn(str); + } + + ///////////////////////////////////////////////////////////////// + } // namespace repo + /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// Added: trunk/libzypp/zypp/repo/RepoInfoBase.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepoInfoBase.h… ============================================================================== --- trunk/libzypp/zypp/repo/RepoInfoBase.h (added) +++ trunk/libzypp/zypp/repo/RepoInfoBase.h Tue Jul 29 17:54:30 2008 @@ -0,0 +1,158 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/repo/RepoInfoBase.h + * + */ +#ifndef REPOINFOBASE_H_ +#define REPOINFOBASE_H_ + +#include <iosfwd> + +#include "zypp/base/PtrTypes.h" + +#include "zypp/Pathname.h" + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + namespace repo + { ///////////////////////////////////////////////////////////////// + + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : RepoInfoBase + // + /** + * \short Base class implementing common features of \ref RepoInfo and + * \ref ServiceInfo. + */ + class RepoInfoBase + { + friend std::ostream & operator<<( std::ostream & str, const RepoInfoBase & obj ); + + public: + RepoInfoBase(); + ~RepoInfoBase(); + + /** + * unique identifier for this source. If not specified + * It should be generated from the base url. + * + * Normally, in a .repo file the section name is used + * ( [somerepo] ) + */ + std::string alias() const; + + /** + * Same as alias(), just escaped in a way to be a valid file name. + */ + std::string escaped_alias() const; + + /** + * \short Repository short label + * + * Short label or description of the repository, to be used on + * the user interface. + * ie: "SUSE Linux 10.2 updates" + */ + std::string name() const; + + /** + * If enabled is false, then this repository must be ignored as if does + * not exists, except when checking for duplicate alias. + */ + bool enabled() const; + + /** + * If true, the repostory must be refreshed before creating resolvables + * from it + */ + bool autorefresh() const; + + /** + * \short File where this repo was read from + * + * \note could be an empty pathname for repo + * infos created in memory. + */ + Pathname filepath() const; + + + public: + + /** + * set the repository alias \see alias + * \param alias + */ + RepoInfoBase & setAlias( const std::string &alias ); + + /** + * set the repository name \see name + * \param name + */ + RepoInfoBase & setName( const std::string &name ); + + /** + * enable or disable the repository \see enabled + * \param enabled + */ + RepoInfoBase & setEnabled( bool enabled ); + + /** + * enable or disable autorefresh \see autorefresh + * \param enabled + */ + RepoInfoBase & setAutorefresh( bool autorefresh ); + + /** + * \short set the path to the .repo file + * + * The path to the .repo file where this repository + * was defined, or empty if nowhere. + * + * \param path File path + */ + RepoInfoBase & setFilepath( const Pathname &filename ); + + /** + * Write a human-readable representation of this RepoInfoBase object + * into the \a str stream. Useful for logging. + */ + virtual std::ostream & dumpOn( std::ostream & str ) const; + + /** + * Write this RepoInfoBase object into \a str in + * a <tr>.repo</tt> (ini) file format. + */ + virtual std::ostream & dumpAsIniOn( std::ostream & str ) const; + + class Impl; + private: + /** Pointer to implementation */ + RWCOW_pointer<Impl> _pimpl; + }; + /////////////////////////////////////////////////////////////////// + + /** \relates RepoInfoBase Stream output */ + std::ostream & operator<<( std::ostream & str, const RepoInfoBase & obj ); + + inline bool operator<( const RepoInfoBase & lhs, const RepoInfoBase & rhs ) + { return lhs.alias() < rhs.alias(); } + + + ///////////////////////////////////////////////////////////////// + } // namespace repo + /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// + +#endif /*REPOINFOBASE_H_*/ Added: trunk/libzypp/zypp/repo/RepoInfoBaseImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepoInfoBaseIm… ============================================================================== --- trunk/libzypp/zypp/repo/RepoInfoBaseImpl.h (added) +++ trunk/libzypp/zypp/repo/RepoInfoBaseImpl.h Tue Jul 29 17:54:30 2008 @@ -0,0 +1,65 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/repo/RepoInfoBaseImpl.h + * + */ +#ifndef REPOINFOBASEIMPL_H_ +#define REPOINFOBASEIMPL_H_ + +#include <string> + +#include "zypp/TriBool.h" +#include "zypp/Pathname.h" + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + namespace repo + { ///////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : RepoInfoBase::Impl + // + struct RepoInfoBase::Impl + { + Impl() + : enabled (indeterminate) + , autorefresh (indeterminate) + {} + + ~Impl() + {} + + public: + TriBool enabled; + TriBool autorefresh; + std::string alias; + std::string escaped_alias; + std::string name; + Pathname filepath; + public: + + private: + friend Impl * rwcowClone<Impl>( const Impl * rhs ); + /** clone for RWCOW_pointer */ + Impl * clone() const + { return new Impl( *this ); } + }; + /////////////////////////////////////////////////////////////////// + + ///////////////////////////////////////////////////////////////// + } // namespace repo + /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// + +#endif /*REPOINFOBASEIMPL_H_*/ Modified: trunk/libzypp/zypp/sat/Pool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Pool.cc?rev=106… ============================================================================== --- trunk/libzypp/zypp/sat/Pool.cc (original) +++ trunk/libzypp/zypp/sat/Pool.cc Tue Jul 29 17:54:30 2008 @@ -107,11 +107,13 @@ if ( alias_r == systemRepoAlias() ) { // autoprovide (dummy) RepoInfo - ret.setInfo( RepoInfo() - .setAlias( alias_r ) - .setName( alias_r ) - .setAutorefresh( true ) - .setEnabled( true ) ); + RepoInfo info; + info + .setAlias( alias_r ) + .setName( alias_r ) + .setAutorefresh( true ) + .setEnabled( true ); + ret.setInfo( info ); } return ret; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10690 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 29 Jul '08

29 Jul '08

Author: jkupec Date: Tue Jul 29 15:29:17 2008 New Revision: 10690 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10690&view=rev Log: changes Modified: trunk/zypper/package/zypper.changes Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Tue Jul 29 15:29:17 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jul 29 15:10:22 CEST 2008 - jkupec(a)suse.cz + +- say Retrieving instead of Downloading when getting files + (bnc #412851) +- r10689 + +------------------------------------------------------------------- Tue Jul 29 10:58:06 CEST 2008 - jkupec(a)suse.cz - addrepo --refresh/-f added to enable autorefresh upon adding the -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10689 - in /trunk/zypper/src: callbacks/repo.h output/OutNormal.cc repos.cc solve-commit.cc utils/misc.cc
by jkupec＠svn.opensuse.org 29 Jul '08

29 Jul '08

Author: jkupec Date: Tue Jul 29 15:10:19 2008 New Revision: 10689 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10689&view=rev Log: - say Retrieving instead of Downloading when getting files (bnc #412851) Modified: trunk/zypper/src/callbacks/repo.h trunk/zypper/src/output/OutNormal.cc trunk/zypper/src/repos.cc trunk/zypper/src/solve-commit.cc trunk/zypper/src/utils/misc.cc Modified: trunk/zypper/src/callbacks/repo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/callbacks/repo.h?rev=… ============================================================================== --- trunk/zypper/src/callbacks/repo.h (original) +++ trunk/zypper/src/callbacks/repo.h Tue Jul 29 15:10:19 2008 @@ -46,7 +46,7 @@ _delta = filename; _delta_size = downloadsize; std::ostringstream s; - s << _("Downloading delta") << ": " + s << _("Retrieving delta") << ": " << _delta << ", " << _delta_size; Zypper::instance()->out().info(s.str()); } @@ -55,8 +55,8 @@ { // seems this is never called, the progress is reported by the media backend anyway INT << "not impelmented" << std::endl; - // TranslatorExplanation This text is a progress display label e.g. "Downloading delta [42%]" - //display_step( "apply-delta", ~("Downloading delta") /*+ _delta.asString()*/, value ); + // TranslatorExplanation This text is a progress display label e.g. "Retrieving delta [42%]" + //display_step( "apply-delta", ~("Retrieving delta") /*+ _delta.asString()*/, value ); return true; } @@ -112,7 +112,7 @@ _patch = filename.basename(); _patch_size = downloadsize; std::ostringstream s; - s << _("Downloading patch rpm") << ": " << _patch << ", " << _patch_size; + s << _("Retrieving patch rpm") << ": " << _patch << ", " << _patch_size; Zypper::instance()->out().info(s.str()); } @@ -149,7 +149,7 @@ Zypper & zypper = *Zypper::instance(); std::ostringstream s; - s << boost::format(_("Downloading %s %s-%s.%s")) + s << boost::format(_("Retrieving %s %s-%s.%s")) % kind_to_string_localized(_resolvable_ptr->kind(), 1) % _resolvable_ptr->name() % _resolvable_ptr->edition() % _resolvable_ptr->arch(); @@ -174,8 +174,8 @@ { // seems this is never called, the progress is reported by the media backend anyway INT << "not impelmented" << std::endl; - // TranslatorExplanation This text is a progress display label e.g. "Downloading [42%]" -// display_step( "download-resolvable", ~("Downloading") /* + resolvable_ptr->name() */, value ); + // TranslatorExplanation This text is a progress display label e.g. "Retrieving [42%]" +// display_step( "download-resolvable", ~("Retrieving") /* + resolvable_ptr->name() */, value ); return true; } Modified: trunk/zypper/src/output/OutNormal.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutNormal.cc?r… ============================================================================== --- trunk/zypper/src/output/OutNormal.cc (original) +++ trunk/zypper/src/output/OutNormal.cc Tue Jul 29 15:10:19 2008 @@ -162,9 +162,9 @@ static AliveCursor cursor; if (isatty(STDOUT_FILENO)) - cout << CLEARLN << ++cursor << " " << _("Downloading:") << " "; + cout << CLEARLN << ++cursor << " " << _("Retrieving:") << " "; else - cout << _("Downloading:") << " "; + cout << _("Retrieving:") << " "; if (verbosity() == DEBUG) cout << uri; //! \todo shorten to fit the width of the terminal else @@ -188,7 +188,7 @@ return; } - cout << CLEARLN << _("Downloading:") << " "; + cout << CLEARLN << _("Retrieving:") << " "; if (verbosity() == DEBUG) cout << uri; //! \todo shorten to fit the width of the terminal else @@ -214,7 +214,7 @@ if (isatty(STDOUT_FILENO)) { - cout << CLEARLN << _("Downloading:") << " "; + cout << CLEARLN << _("Retrieving:") << " "; if (verbosity() == DEBUG) cout << uri; //! \todo shorten to fit the width of the terminal else Modified: trunk/zypper/src/repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/repos.cc?rev=10689&r1… ============================================================================== --- trunk/zypper/src/repos.cc (original) +++ trunk/zypper/src/repos.cc Tue Jul 29 15:10:19 2008 @@ -122,7 +122,7 @@ if (do_refresh) { plabel = str::form( - _("Downloading repository '%s' metadata"), repo.name().c_str()); + _("Retrieving repository '%s' metadata"), repo.name().c_str()); zypper.out().progressStart("raw-refresh", plabel, true); manager.refreshMetadata(repo, @@ -145,7 +145,7 @@ plabel.clear(); } zypper.out().error(e, - boost::str(format(_("Problem downloading files from '%s'.")) % repo.name()), + boost::str(format(_("Problem retrieving files from '%s'.")) % repo.name()), _("Please see the above error message for a hint.")); return true; // error @@ -203,7 +203,7 @@ plabel.clear(); } zypper.out().error(e, - boost::str(format(_("Error downloading metadata for '%s':")) % repo.name())); + boost::str(format(_("Error retrieving metadata for '%s':")) % repo.name())); // log untranslated message ERR << format("Error reading repository '%s':") % repo.name() << endl; @@ -2027,7 +2027,7 @@ ZYPP_CAUGHT(e); zypper.out().error(e, str::form( - _("Problem downloading the repository index file for service '%s':"), + _("Problem retrieving the repository index file for service '%s':"), s.name().c_str()), _("Check if the URI is valid and accessible.")); zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP); Modified: trunk/zypper/src/solve-commit.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/solve-commit.cc?rev=1… ============================================================================== --- trunk/zypper/src/solve-commit.cc (original) +++ trunk/zypper/src/solve-commit.cc Tue Jul 29 15:10:19 2008 @@ -1061,7 +1061,7 @@ catch ( const media::MediaException & e ) { ZYPP_CAUGHT(e); zypper.out().error(e, - _("Problem downloading the package file from the repository:"), + _("Problem retrieving the package file from the repository:"), _("Please see the above error message for a hint.")); zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP); return; @@ -1095,7 +1095,7 @@ e.info().alias() % "zypper refresh" ); } zypper.out().error(e, - _("Problem downloading the package file from the repository:"), + _("Problem retrieving the package file from the repository:"), hint); zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP); return; Modified: trunk/zypper/src/utils/misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/utils/misc.cc?rev=106… ============================================================================== --- trunk/zypper/src/utils/misc.cc (original) +++ trunk/zypper/src/utils/misc.cc Tue Jul 29 15:10:19 2008 @@ -236,7 +236,7 @@ catch (const Exception & e) { Zypper::instance()->out().error(e, - _("Problem downloading the specified RPM file") + string(":"), + _("Problem retrieving the specified RPM file") + string(":"), _("Please check whether the file is accessible.")); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10688 - /trunk/libzypp/package/libzypp.changes
by jkupec＠svn.opensuse.org 29 Jul '08

29 Jul '08

Author: jkupec Date: Tue Jul 29 13:01:43 2008 New Revision: 10688 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10688&view=rev Log: - an older change Modified: trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Tue Jul 29 13:01:43 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jul 29 12:59:46 CEST 2008 - jkupec(a)suse.cz + +- fixed yum repos to work with non '/' base url post fix + (bnc #341617) +- revision 10662 + +------------------------------------------------------------------- Mon Jul 28 18:13:24 CEST 2008- ma(a)suse.de - Fixed SolvIterMixin::Selectable_iterator eating some solvables -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10687 - in /trunk/zypper: VERSION.cmake doc/zypper.8 package/zypper.changes
by jkupec＠svn.opensuse.org 29 Jul '08

29 Jul '08

Author: jkupec Date: Tue Jul 29 11:03:58 2008 New Revision: 10687 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10687&view=rev Log: - man page update - changes & version Modified: trunk/zypper/VERSION.cmake trunk/zypper/doc/zypper.8 trunk/zypper/package/zypper.changes Modified: trunk/zypper/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/VERSION.cmake?rev=10687&r… ============================================================================== --- trunk/zypper/VERSION.cmake (original) +++ trunk/zypper/VERSION.cmake Tue Jul 29 11:03:58 2008 @@ -20,4 +20,4 @@ SET(VERSION_MAJOR "0") SET(VERSION_MINOR "12") -SET(VERSION_PATCH "0") +SET(VERSION_PATCH "1") Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=10687&r1… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Tue Jul 29 11:03:58 2008 @@ -1,4 +1,4 @@ -.TH "zypper" "8" "0.12.0" "zypper" "System Tools" +.TH "zypper" "8" "0.12.1" "zypper" "System Tools" .SH "SYNTAX" .LP zypper [\fI\-\-global\-options\fR] <\fBcommand\fR> [\fI\-\-command\-options\fR] [\fBcommand-arguments\fR] @@ -544,7 +544,7 @@ \fBplaindir\fR - Plaindir. .TP \fI\-d, \-\-disable\fR -Add the repository as disabled. +Add the repository as disabled. Repositories are added as enabled by default. .TP \fI\-c, \-\-check\fR Probe given URI. @@ -560,6 +560,10 @@ .TP \fI\-K, \-\-no-keep-packages\fR Disable RPM files caching. +.TP +.I \-f, \-\-refresh +Enable autorefresh of the repository. The autorefresh is disabled by default when adding +new repositories. .TP .B removerepo (rr) [options] <alias|#|URI> ... Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Tue Jul 29 11:03:58 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jul 29 10:58:06 CEST 2008 - jkupec(a)suse.cz + +- addrepo --refresh/-f added to enable autorefresh upon adding the + repo (bnc #406006) +- r10686 + +------------------------------------------------------------------- Mon Jul 28 18:58:27 CEST 2008 - jkupec(a)suse.cz - fixed some stupid and some clever bugs in seach (bnc #411339, bnc -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10686 - in /trunk/zypper/src: Zypper.cc repos.cc repos.h
by jkupec＠svn.opensuse.org 29 Jul '08

29 Jul '08

Author: jkupec Date: Tue Jul 29 10:57:56 2008 New Revision: 10686 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10686&view=rev Log: - addrepo --refresh/-f added to enable autorefresh upon adding the repo (bnc #406006) Modified: trunk/zypper/src/Zypper.cc trunk/zypper/src/repos.cc trunk/zypper/src/repos.h Modified: trunk/zypper/src/Zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.cc?rev=10686&r… ============================================================================== --- trunk/zypper/src/Zypper.cc (original) +++ trunk/zypper/src/Zypper.cc Tue Jul 29 10:57:56 2008 @@ -1080,6 +1080,7 @@ {"name", required_argument, 0, 'n'}, {"keep-packages", no_argument, 0, 'k'}, {"no-keep-packages", no_argument, 0, 'K'}, + {"refresh", no_argument, 0, 'f'}, {0, 0, 0, 0} }; specific_options = service_add_options; @@ -1092,7 +1093,7 @@ " or can be read from specified .repo file (even remote).\n" "\n" " Command options:\n" - "-r, --repo <FILE.repo> Read the URI and alias from a file (even remote).\n" + "-r, --repo <FILE.repo> Just another means to specify a .repo file to read.\n" "-t, --type <TYPE> Type of repository (%s).\n" "-d, --disable Add the repository as disabled.\n" "-c, --check Probe URI.\n" @@ -1100,6 +1101,7 @@ "-n, --name Specify descriptive name for the repository.\n" "-k, --keep-packages Enable RPM files caching.\n" "-K, --no-keep-packages Disable RPM files caching.\n" + "-f, --refresh Enable autorefresh of the repository.\n" ), "yast2, rpm-md, plaindir"); break; } @@ -2233,12 +2235,16 @@ } // indeterminate indicates the user has not specified the values - tribool enabled(indeterminate); + TriBool enabled = indeterminate; if (copts.count("disable") || copts.count("disabled")) enabled = false; - tribool keep_pkgs; + TriBool autorefresh = indeterminate; + if (copts.count("refresh")) + autorefresh = true; + + TriBool keep_pkgs; if (copts.count("keep-packages")) keep_pkgs = true; else if (copts.count("no-keep-packages")) @@ -2249,7 +2255,7 @@ // add repository specified in .repo file if (copts.count("repo")) { - add_repo_from_file(*this,copts["repo"].front(), enabled, false, keep_pkgs); + add_repo_from_file(*this,copts["repo"].front(), enabled, autorefresh, keep_pkgs); return; } @@ -2296,7 +2302,7 @@ } else { - add_repo_from_file(*this,_arguments[0], enabled, false, keep_pkgs); + add_repo_from_file(*this,_arguments[0], enabled, autorefresh, keep_pkgs); break; } case 2: @@ -2307,8 +2313,6 @@ return; } - // by default, enable the repo and set autorefresh to false - if (indeterminate(enabled)) enabled = true; if (copts.count("check")) { if (!copts.count("no-check")) @@ -2328,7 +2332,7 @@ init_target(*this); add_repo_by_url( - *this, url, _arguments[1]/*alias*/, type, enabled, false, keep_pkgs); + *this, url, _arguments[1]/*alias*/, type, enabled, autorefresh, keep_pkgs); return; } } Modified: trunk/zypper/src/repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/repos.cc?rev=10686&r1… ============================================================================== --- trunk/zypper/src/repos.cc (original) +++ trunk/zypper/src/repos.cc Tue Jul 29 10:57:56 2008 @@ -1314,7 +1314,7 @@ void add_repo_by_url( Zypper & zypper, const zypp::Url & url, const string & alias, const string & type, - tribool enabled, tribool autorefresh, tribool keepPackages) + TriBool enabled, TriBool autorefresh, TriBool keepPackages) { MIL << "going to add repository by url (alias=" << alias << ", url=" << url << ")" << endl; @@ -1330,12 +1330,16 @@ repo.setName(it->second.front()); repo.addBaseUrl(url); - if ( !indeterminate(enabled) ) - repo.setEnabled((enabled == true)); + // enable the repo by default + if ( indeterminate(enabled) ) + enabled = true; + repo.setEnabled((enabled == true)); + + // disable autorefresh by default if ( indeterminate(autorefresh) ) - repo.setAutorefresh(false); - else - repo.setAutorefresh((autorefresh == true)); + autorefresh = false; + repo.setAutorefresh((autorefresh == true)); + if ( !indeterminate(keepPackages) ) repo.setKeepPackages(keepPackages); @@ -1344,12 +1348,10 @@ // ---------------------------------------------------------------------------- -//! \todo handle zypp exceptions void add_repo_from_file( Zypper & zypper, - const std::string & repo_file_url, tribool enabled, - tribool autorefresh, tribool keepPackages) + const std::string & repo_file_url, TriBool enabled, + TriBool autorefresh, TriBool keepPackages) { - //! \todo handle local .repo files, validate the URI Url url = make_url(repo_file_url); if (!url.isValid()) { @@ -1411,14 +1413,20 @@ continue; } - MIL << "enabled: " << enabled << " autorefresh: " << autorefresh << endl; - if ( !indeterminate(enabled) ) - repo.setEnabled((enabled == true)); - if ( !indeterminate(autorefresh) ) - repo.setAutorefresh((autorefresh == false)); + MIL << "requested: enabled: " << enabled << " autorefresh: " << autorefresh << endl; + // enable by default + if ( indeterminate(enabled) ) + enabled = true; + repo.setEnabled((enabled == true)); + // disable autorefresh by default + if ( indeterminate(autorefresh) ) + autorefresh = false; + repo.setAutorefresh((autorefresh == true)); + if ( !indeterminate(keepPackages) ) repo.setKeepPackages(keepPackages); - MIL << "enabled: " << repo.enabled() << " autorefresh: " << repo.autorefresh() << endl; + + MIL << "to-be-added: enabled: " << repo.enabled() << " autorefresh: " << repo.autorefresh() << endl; add_repo(zypper, repo); } Modified: trunk/zypper/src/repos.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/repos.h?rev=10686&r1=… ============================================================================== --- trunk/zypper/src/repos.h (original) +++ trunk/zypper/src/repos.h Tue Jul 29 10:57:56 2008 @@ -8,8 +8,7 @@ #ifndef ZMART_SOURCES_H #define ZMART_SOURCES_H -//#include <boost/logic/tribool.hpp> - +#include "zypp/TriBool.h" #include "zypp/Url.h" #include "zypp/RepoInfo.h" #include "zypp/Service.h" @@ -82,9 +81,9 @@ const zypp::Url & url, const std::string & alias, const std::string & type = "", - boost::tribool enabled = boost::indeterminate, - boost::tribool autorefresh = boost::indeterminate, - boost::tribool keepPackages = boost::indeterminate); + zypp::TriBool enabled = boost::indeterminate, + zypp::TriBool autorefresh = boost::indeterminate, + zypp::TriBool keepPackages = boost::indeterminate); /** * Add repository specified in given repo file on \a repo_file_url. All repos @@ -97,9 +96,9 @@ */ void add_repo_from_file(Zypper & zypper, const std::string & repo_file_url, - boost::tribool enabled = boost::indeterminate, - boost::tribool autorefresh = boost::indeterminate, - boost::tribool keepPackages = boost::indeterminate); + zypp::TriBool enabled = boost::indeterminate, + zypp::TriBool autorefresh = boost::indeterminate, + zypp::TriBool keepPackages = boost::indeterminate); /** -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0