June 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r10441 - /trunk/zypper/doc/zypper.8
by jkupec＠svn.opensuse.org 22 Jun '08

22 Jun '08

Author: jkupec Date: Sun Jun 22 14:18:44 2008 New Revision: 10441 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10441&view=rev Log: missing option Modified: trunk/zypper/doc/zypper.8 Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=10441&r1… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Sun Jun 22 14:18:44 2008 @@ -443,11 +443,15 @@ Search only in the repository specified by the alias, number or URI. Multiple \-r options are allowed. .TP -\fI \-\-sort\-by\-name\fR +.I \ \ \ \ \-\-sort\-by\-name Sort packages by name (default). .TP -\fI \-\-sort\-by\-repo\fR +.I \ \ \ \ \-\-sort\-by\-repo Sort packages by catalog, not by name. +.TP +.I \-s, \-\-details +Show all available version of found packages, each version in each repository +on a separate line. .SS Patch Management -- 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] r10440 - in /trunk/zypper/src: zypper-updates.cc zypper-updates.h
by jkupec＠svn.opensuse.org 21 Jun '08

21 Jun '08

Author: jkupec Date: Sat Jun 21 19:13:24 2008 New Revision: 10440 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10440&view=rev Log: - unused Removed: trunk/zypper/src/zypper-updates.cc trunk/zypper/src/zypper-updates.h -- 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] r10439 - in /trunk/dialogsolver/src: restreewidget.cpp restreewidget.h
by schubi2＠svn.opensuse.org 20 Jun '08

20 Jun '08

Author: schubi2 Date: Fri Jun 20 18:00:11 2008 New Revision: 10439 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10439&view=rev Log: bugfix Modified: trunk/dialogsolver/src/restreewidget.cpp trunk/dialogsolver/src/restreewidget.h Modified: trunk/dialogsolver/src/restreewidget.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/restreewidget.c… ============================================================================== --- trunk/dialogsolver/src/restreewidget.cpp (original) +++ trunk/dialogsolver/src/restreewidget.cpp Fri Jun 20 18:00:11 2008 @@ -46,6 +46,7 @@ : QWidget( parent, name, fl ) ,resolver(r) { + _lastSelectedItem = ""; if ( !name ) setName( "ResTreeWidget" ); ResTreeWidgetLayout = new QVBoxLayout( this, 11, 6, "ResTreeWidgetLayout"); @@ -118,6 +119,7 @@ m_RevGraphView->dumpRevtree(); if (m_RevGraphView && resolvableList) { + resolvableList->clear(); // creating entries in the combobox ResGraphView::trevTree::ConstIterator it; QStringList stringList; @@ -135,6 +137,7 @@ stringList.sort(); resolvableList->insertStringList (stringList); } + selectItem(_lastSelectedItem); // Show the selected item (Could be set via API meanwhile) } void ResTreeWidget::setDetailText(const QString& _s, const zypp::PoolItem item) @@ -189,6 +192,7 @@ } void ResTreeWidget::selectItem(const QString & itemString) { + _lastSelectedItem = itemString; m_RevGraphView->selectItem (itemString ); } @@ -285,6 +289,7 @@ } } dumpRevtree(); + selectItem(_lastSelectedItem); } void ResTreeWidget::buildTreeBranch ( ResGraphView::tlist &childList, const zypp::PoolItem item, int &id) { Modified: trunk/dialogsolver/src/restreewidget.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/restreewidget.h… ============================================================================== --- trunk/dialogsolver/src/restreewidget.h (original) +++ trunk/dialogsolver/src/restreewidget.h Fri Jun 20 18:00:11 2008 @@ -80,7 +80,8 @@ void selectItem(const QString & itemString); void buildTreeBranch (ResGraphView::tlist &childList, const zypp::PoolItem item, int &id); - + + QString _lastSelectedItem; protected slots: virtual void setDetailText(const QString&, const zypp::PoolItem); -- 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] r10438 - /trunk/libzypp/zypp/RepoManager.cc
by jreidinger＠svn.opensuse.org 20 Jun '08

20 Jun '08

Author: jreidinger Date: Fri Jun 20 17:31:35 2008 New Revision: 10438 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10438&view=rev Log: fix modify Modified: trunk/libzypp/zypp/RepoManager.cc 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 Fri Jun 20 17:31:35 2008 @@ -1306,7 +1306,7 @@ const ProgressData::ReceiverFnc & progressrcv ) { RepoInfo info; - info.setAlias(info.alias()); + info.setAlias(alias); RepoConstIterator it = _pimpl->repos.find( info ); if( it == repoEnd() ) ZYPP_THROW(RepoNotFoundException(info)); @@ -1346,6 +1346,7 @@ if( _pimpl->services.find(service)!= _pimpl->services.end() ) return; //TODO throw exception + //this is need to save location to correct service const Service& savedService = *(_pimpl->services.insert( service )).first; _pimpl->saveService( savedService ); -- 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] r10437 - in /trunk/libzypp-bindings/swig: Service.i zypp.i
by jreidinger＠svn.opensuse.org 20 Jun '08

20 Jun '08

Author: jreidinger Date: Fri Jun 20 17:01:22 2008 New Revision: 10437 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10437&view=rev Log: so hope now it is fixed Removed: trunk/libzypp-bindings/swig/Service.i Modified: trunk/libzypp-bindings/swig/zypp.i Modified: trunk/libzypp-bindings/swig/zypp.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/zypp.i?rev… ============================================================================== --- trunk/libzypp-bindings/swig/zypp.i (original) +++ trunk/libzypp-bindings/swig/zypp.i Fri Jun 20 17:01:22 2008 @@ -44,6 +44,7 @@ #include "zypp/OnMediaLocation.h" #include "zypp/Repository.h" #include "zypp/RepoManager.h" +#include "zypp/Service.h" #include "zypp/repo/RepoType.h" #include "zypp/TmpPath.h" #include "zypp/Resolver.h" @@ -115,7 +116,6 @@ %include "RepoType.i" %include "Repository.i" %include "RepoInfo.i" -%include "Service.i" %include "RepoManager.i" %include "RepoStatus.i" %include "ResObject.i" -- 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] r10436 - /trunk/libzypp-bindings/swig/zypp.i
by jreidinger＠svn.opensuse.org 20 Jun '08

20 Jun '08

Author: jreidinger Date: Fri Jun 20 16:46:56 2008 New Revision: 10436 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10436&view=rev Log: add include for header Modified: trunk/libzypp-bindings/swig/zypp.i Modified: trunk/libzypp-bindings/swig/zypp.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/zypp.i?rev… ============================================================================== --- trunk/libzypp-bindings/swig/zypp.i (original) +++ trunk/libzypp-bindings/swig/zypp.i Fri Jun 20 16:46:56 2008 @@ -115,6 +115,7 @@ %include "RepoType.i" %include "Repository.i" %include "RepoInfo.i" +%include "Service.i" %include "RepoManager.i" %include "RepoStatus.i" %include "ResObject.i" -- 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] r10435 - /trunk/libzypp-bindings/swig/Service.i
by jreidinger＠svn.opensuse.org 20 Jun '08

20 Jun '08

Author: jreidinger Date: Fri Jun 20 16:35:33 2008 New Revision: 10435 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10435&view=rev Log: fix build Added: trunk/libzypp-bindings/swig/Service.i Added: trunk/libzypp-bindings/swig/Service.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/Service.i?… ============================================================================== --- trunk/libzypp-bindings/swig/Service.i (added) +++ trunk/libzypp-bindings/swig/Service.i Fri Jun 20 16:35:33 2008 @@ -0,0 +1,6 @@ +#ifdef SWIGPERL5 +#else + %template(UrlSet) std::set<Url>; +#endif + +%include <zypp/Service.h> -- 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] r10434 - in /trunk/libzypp/zypp: RepoManager.cc RepoManager.h
by jreidinger＠svn.opensuse.org 20 Jun '08

20 Jun '08

Author: jreidinger Date: Fri Jun 20 16:22:42 2008 New Revision: 10434 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10434&view=rev Log: change getService method to provide copy and not const reference Modified: trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/RepoManager.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 Fri Jun 20 16:22:42 2008 @@ -1416,11 +1416,8 @@ MIL << "done" << endl; } - const Service& RepoManager::getService( const std::string& name ) const + Service RepoManager::getService( const std::string& name ) const { - //little trick for Set, because it is sorted by Service name - Service tmpServ(name); - ServiceConstIterator it = _pimpl->services.find(name); if ( it == serviceEnd() ) return Service::noService; 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 Fri Jun 20 16:22:42 2008 @@ -457,7 +457,7 @@ ServiceConstIterator serviceEnd() const; - const Service& getService( const std::string& name ) const; + Service getService( const std::string& name ) const; void refreshServices(); -- 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] r10433 - in /trunk/libzypp: tests/zypp/ tests/zypp/data/RepoManager/repo/ tests/zypp/data/RepoManager/second/ tests/zypp/data/RepoManager/second/repo/ zypp/ zypp/parser/
by jreidinger＠svn.opensuse.org 20 Jun '08

20 Jun '08

Author: jreidinger Date: Fri Jun 20 16:13:07 2008 New Revision: 10433 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10433&view=rev Log: improve service handling and write tests for it. Added: trunk/libzypp/tests/zypp/data/RepoManager/repo/ trunk/libzypp/tests/zypp/data/RepoManager/repo/repoindex.xml trunk/libzypp/tests/zypp/data/RepoManager/second/ trunk/libzypp/tests/zypp/data/RepoManager/second/repo/ trunk/libzypp/tests/zypp/data/RepoManager/second/repo/repoindex.xml Modified: trunk/libzypp/tests/zypp/Deltarpm_test.cc trunk/libzypp/tests/zypp/RepoManager_test.cc trunk/libzypp/zypp/RepoInfo.cc trunk/libzypp/zypp/RepoInfo.h trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/RepoManager.h trunk/libzypp/zypp/Service.cc trunk/libzypp/zypp/Service.h trunk/libzypp/zypp/parser/RepoFileReader.cc trunk/libzypp/zypp/parser/ServiceFileReader.cc Modified: trunk/libzypp/tests/zypp/Deltarpm_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/Deltarpm_test… ============================================================================== --- trunk/libzypp/tests/zypp/Deltarpm_test.cc (original) +++ trunk/libzypp/tests/zypp/Deltarpm_test.cc Fri Jun 20 16:13:07 2008 @@ -33,6 +33,9 @@ RepoManagerOptions opts(rootdir); opts.repoRawCachePath = rootdir; opts.repoSolvCachePath = rootdir; + opts.knownReposPath = rootdir; + opts.knownServicesPath = rootdir; + RepoManager rm(opts); RepoInfo updates; 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 Fri Jun 20 16:13:07 2008 @@ -10,6 +10,7 @@ #include "zypp/PublicKey.h" #include "zypp/TmpPath.h" #include "zypp/PathInfo.h" +#include "zypp/Service.h" #include "zypp/RepoManager.h" @@ -34,6 +35,7 @@ RepoManagerOptions opts( RepoManagerOptions::makeTestSetup( tmpCachePath ) ) ; filesystem::mkdir( opts.knownReposPath ); + filesystem::mkdir( opts.knownServicesPath ); BOOST_CHECK_EQUAL( filesystem::copy_dir_content( DATADIR + "/repos.d", opts.knownReposPath ), 0 ); RepoManager manager(opts); @@ -73,11 +75,34 @@ RepoInfo macromedia; macromedia.setAlias("macromedia"); manager.removeRepository(macromedia); - repos = manager.knownRepositories(); - BOOST_CHECK_EQUAL(repos.size(), (unsigned) 4); + BOOST_CHECK_EQUAL(manager.repoSize(), (unsigned) 4); // the file should not exist anymore BOOST_CHECK( ! PathInfo(opts.knownReposPath + "/proprietary.repo_1").isExist() ); + //test service + Url urlS; + urlS.setPathName(DATADIR.asString()); + urlS.setScheme("dir"); + Service service("test",urlS); + + manager.addService(service); + manager.refreshServices(); + BOOST_CHECK_EQUAL(manager.repoSize(), (unsigned) 7); //+3 from repoindex + + //simulate change of repoindex.xml + urlS.setPathName((DATADIR+"second").asString()); + urlS.setScheme("dir"); + service.setUrl(urlS); + + manager.modifyService(service.name(),service); + manager.refreshServices(); + 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 + // let test cache creation Added: trunk/libzypp/tests/zypp/data/RepoManager/repo/repoindex.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/RepoMana… ============================================================================== --- trunk/libzypp/tests/zypp/data/RepoManager/repo/repoindex.xml (added) +++ trunk/libzypp/tests/zypp/data/RepoManager/repo/repoindex.xml Fri Jun 20 16:13:07 2008 @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<repoindex> + <repo name="SLES10-SP2-Online" + alias="SLES10-SP2-Online" + description="SLES10-SP2-Online for sles-10-i586" + distro_target="sles-10-i586" path="$RCE/SLES10-SP2-Online/sles-10-i586" + priority="0" + pub="0" /> + <repo name="SLE10-SP2-Debuginfo-Updates" + alias="SLE10-SP2-Debuginfo-Updates" + description="SLE10-SP2-Debuginfo-Updates for sles-10-i586" + distro_target="sles-10-i586" + path="$RCE/SLE10-SP2-Debuginfo-Updates/sles-10-i586" + priority="0" + pub="0" /> + <repo name="SLES10-SP2-Updates" + alias="SLES10-SP2-Updates" + description="SLES10-SP2-Updates for sles-10-i586" + distro_target="sles-10-i586" + path="$RCE/SLES10-SP2-Updates/sles-10-i586" + priority="0" + pub="0" /> +</repoindex> + Added: trunk/libzypp/tests/zypp/data/RepoManager/second/repo/repoindex.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/RepoMana… ============================================================================== --- trunk/libzypp/tests/zypp/data/RepoManager/second/repo/repoindex.xml (added) +++ trunk/libzypp/tests/zypp/data/RepoManager/second/repo/repoindex.xml Fri Jun 20 16:13:07 2008 @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<repoindex> + <repo name="SLES10-SP2-Online" + alias="SLES10-SP2-Online" + description="SLES10-SP2-Online for sles-10-i586" + distro_target="sles-10-i586" path="$RCE/SLES10-SP2-Online/sles-10-i586" + priority="0" + pub="0" /> + <repo name="SLES10-SP2-Updates" + alias="SLES10-SP2-Updates" + description="SLES10-SP2-Updates for sles-10-i586" + distro_target="sles-10-i586" + path="$RCE/SLES10-SP2-Updates/sles-10-i586" + priority="0" + pub="0" /> +</repoindex> + Modified: trunk/libzypp/zypp/RepoInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.cc?rev=104… ============================================================================== --- trunk/libzypp/zypp/RepoInfo.cc (original) +++ trunk/libzypp/zypp/RepoInfo.cc Fri Jun 20 16:13:07 2008 @@ -77,6 +77,7 @@ std::string alias; std::string escaped_alias; std::string name; + std::string service; Pathname filepath; Pathname metadatapath; Pathname packagespath; @@ -255,6 +256,12 @@ return *this; } + RepoInfo & RepoInfo::setService( const std::string& name ) + { + _pimpl->service = name; + return *this; + } + bool RepoInfo::enabled() const { return _pimpl->enabled; } @@ -317,6 +324,9 @@ Pathname RepoInfo::path() const { return _pimpl->path; } + std::string RepoInfo::service() const + { return _pimpl->service; } + RepoInfo::urls_const_iterator RepoInfo::baseUrlsBegin() const { return make_transform_iterator( _pimpl->baseUrls.begin(), @@ -359,6 +369,7 @@ str << "- gpgcheck : " << gpgCheck() << std::endl; str << "- gpgkey : " << gpgKeyUrl() << std::endl; str << "- keeppackages: " << keepPackages() << std::endl; + str << "- service : " << service() << std::endl; return str; } @@ -397,6 +408,9 @@ str << "keeppackages=" << keepPackages() << endl; + if( ! service().empty() ) + str << "service=" << service() << endl; + return str; } Modified: trunk/libzypp/zypp/RepoInfo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.h?rev=1043… ============================================================================== --- trunk/libzypp/zypp/RepoInfo.h (original) +++ trunk/libzypp/zypp/RepoInfo.h Fri Jun 20 16:13:07 2008 @@ -238,6 +238,12 @@ */ bool keepPackages() const; + /** + * Gets service name which add it or empty string if this repository + * is added manually. + */ + std::string service() const; + public: /** * Add a base url. \see baseUrls @@ -366,6 +372,11 @@ RepoInfo & setKeepPackages( bool keep ); /** + * sets service which added this repository + */ + RepoInfo & setService( const std::string& name ); + + /** * Write a human-readable representation of this RepoInfo object * into the \a str stream. Useful for logging. */ @@ -386,6 +397,9 @@ /** \relates RepoInfo Stream output */ std::ostream & operator<<( std::ostream & str, const RepoInfo & obj ); + inline bool operator<( const RepoInfo& lhs, const RepoInfo & rhs ) + { return lhs.alias() < rhs.alias(); } + typedef std::list<RepoInfo> RepoInfoList; ///////////////////////////////////////////////////////////////// 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 Fri Jun 20 16:13:07 2008 @@ -36,6 +36,7 @@ #include "zypp/parser/RepoFileReader.h" #include "zypp/parser/ServiceFileReader.h" +#include "zypp/parser/RepoindexFileReader.h" #include "zypp/repo/yum/Downloader.h" #include "zypp/parser/yum/RepoParser.h" #include "zypp/repo/susetags/Downloader.h" @@ -239,6 +240,8 @@ Impl( const RepoManagerOptions &opt ) : options(opt) { + knownServices(); + knownRepositories(); } @@ -249,7 +252,7 @@ RepoManagerOptions options; - map<string, RepoInfo> _repoinfos; + RepoSet repos; ServiceSet services; @@ -261,7 +264,7 @@ return _nullimpl; } - void saveService( const Service& service ); + void saveService( const Service& service ) const; Pathname generateNonExistingName( const Pathname &dir, const std::string &basefilename ) const; @@ -278,6 +281,8 @@ void knownServices(); + void knownRepositories(); + private: friend Impl * rwcowClone<Impl>( const Impl * rhs ); /** clone for RWCOW_pointer */ @@ -310,31 +315,44 @@ //////////////////////////////////////////////////////////////////////////// + bool RepoManager::repoEmpty() const { return _pimpl->repos.empty(); } + RepoManager::RepoSizeType RepoManager::repoSize() const + { return _pimpl->repos.size(); } + RepoManager::RepoConstIterator RepoManager::repoBegin() const + { return _pimpl->repos.begin(); } + RepoManager::RepoConstIterator RepoManager::repoEnd() const + { return _pimpl->repos.end(); } + + std::list<RepoInfo> RepoManager::knownRepositories() const { - MIL << endl; + return std::list<RepoInfo>(repoBegin(),repoEnd()); + } + + void RepoManager::Impl::knownRepositories() + { + MIL << "start construct known repos" << endl; - if ( PathInfo(_pimpl->options.knownReposPath).isExist() ) + if ( PathInfo(options.knownReposPath).isExist() ) { - RepoInfoList repos = repositories_in_dir(_pimpl->options.knownReposPath); - for ( RepoInfoList::iterator it = repos.begin(); - it != repos.end(); + RepoInfoList repol = repositories_in_dir(options.knownReposPath); + for ( RepoInfoList::iterator it = repol.begin(); + it != repol.end(); ++it ) { // set the metadata path for the repo - Pathname metadata_path = rawcache_path_for_repoinfo(_pimpl->options, (*it)); + Pathname metadata_path = rawcache_path_for_repoinfo(options, (*it)); (*it).setMetadataPath(metadata_path); // set the downloaded packages path for the repo - Pathname packages_path = packagescache_path_for_repoinfo(_pimpl->options, (*it)); + Pathname packages_path = packagescache_path_for_repoinfo(options, (*it)); (*it).setPackagesPath(packages_path); + + repos.insert(*it); } - return repos; } - else - return std::list<RepoInfo>(); - MIL << endl; + MIL << "end construct known repos" << endl; } //////////////////////////////////////////////////////////////////////////// @@ -599,9 +617,7 @@ // Adjust the probed type in RepoInfo info.setProbedType( repokind ); // lazy init! //save probed type only for repos in system - std::list<RepoInfo> repos = knownRepositories(); - for ( std::list<RepoInfo>::const_iterator it = repos.begin(); - it != repos.end(); ++it ) + for_( it, repoBegin(), repoEnd() ) { if ( info.alias() == (*it).alias() ) { @@ -639,10 +655,7 @@ * repo has the same file, it will not download it * but copy it from the other repository */ - std::list<RepoInfo> repos = knownRepositories(); - for ( std::list<RepoInfo>::const_iterator it = repos.begin(); - it != repos.end(); - ++it ) + for_( it, repoBegin(), repoEnd() ) { Pathname cachepath(rawcache_path_for_repoinfo( _pimpl->options, *it )); if ( PathInfo(cachepath).isExist() ) @@ -1056,16 +1069,10 @@ progress.name(str::form(_("Adding repository '%s'"), info.name().c_str())); progress.toMin(); - std::list<RepoInfo> repos = knownRepositories(); - for ( std::list<RepoInfo>::const_iterator it = repos.begin(); - it != repos.end(); - ++it ) - { - if ( info.alias() == (*it).alias() ) + RepoInfo tosave = info; + if(_pimpl->repos.find(tosave)!= _pimpl->repos.end()) ZYPP_THROW(RepoAlreadyExistsException(info)); - } - RepoInfo tosave = info; // check the first url for now if ( _pimpl->options.probe ) @@ -1099,6 +1106,8 @@ } tosave.dumpRepoOn(file); + tosave.setFilepath(repofile); + _pimpl->repos.insert(tosave); progress.toMax(); MIL << "done" << endl; } @@ -1106,16 +1115,13 @@ void RepoManager::addRepositories( const Url &url, const ProgressData::ReceiverFnc & progressrcv ) { - std::list<RepoInfo> knownrepos = knownRepositories(); std::list<RepoInfo> repos = readRepoFile(url); for ( std::list<RepoInfo>::const_iterator it = repos.begin(); it != repos.end(); ++it ) { // look if the alias is in the known repos. - for ( std::list<RepoInfo>::const_iterator kit = knownrepos.begin(); - kit != knownrepos.end(); - ++kit ) + for_ ( kit, repoBegin(), repoEnd() ) { if ( (*it).alias() == (*kit).alias() ) { @@ -1142,12 +1148,14 @@ ZYPP_THROW (Exception( "Can't open " + repofile.asString() ) ); } - for ( std::list<RepoInfo>::const_iterator it = repos.begin(); + for ( std::list<RepoInfo>::iterator it = repos.begin(); it != repos.end(); ++it ) { MIL << "Saving " << (*it).alias() << endl; - (*it).dumpRepoOn(file); + it->setFilepath(repofile.asString()); + it->dumpRepoOn(file); + _pimpl->repos.insert(*it); } MIL << "done" << endl; } @@ -1164,10 +1172,7 @@ MIL << "Going to delete repo " << info.alias() << endl; - std::list<RepoInfo> repos = knownRepositories(); - for ( std::list<RepoInfo>::const_iterator it = repos.begin(); - it != repos.end(); - ++it ) + for_( it, repoBegin(), repoEnd() ) { // they can be the same only if the provided is empty, that means // the provided repo has no alias @@ -1228,6 +1233,7 @@ cleanCache( todelete, subprogrcv); // now delete metadata (#301037) cleanMetadata( todelete, cleansubprogrcv); + _pimpl->repos.erase(todelete); MIL << todelete.alias() << " sucessfully deleted." << endl; return; } // else filepath is empty @@ -1248,10 +1254,7 @@ // check if the new alias already exists when renaming the repo if (alias != newinfo.alias()) { - std::list<RepoInfo> repos = knownRepositories(); - for ( std::list<RepoInfo>::const_iterator it = repos.begin(); - it != repos.end(); - ++it ) + for_( it, repoBegin(), repoEnd() ) { if ( newinfo.alias() == (*it).alias() ) ZYPP_THROW(RepoAlreadyExistsException(newinfo)); @@ -1291,6 +1294,9 @@ else newinfo.dumpRepoOn(file); } + + _pimpl->repos.erase(toedit); + _pimpl->repos.insert(newinfo); } } @@ -1299,17 +1305,13 @@ RepoInfo RepoManager::getRepositoryInfo( const std::string &alias, const ProgressData::ReceiverFnc & progressrcv ) { - std::list<RepoInfo> repos = knownRepositories(); - for ( std::list<RepoInfo>::const_iterator it = repos.begin(); - it != repos.end(); - ++it ) - { - if ( (*it).alias() == alias ) - return *it; - } RepoInfo info; info.setAlias(info.alias()); - ZYPP_THROW(RepoNotFoundException(info)); + RepoConstIterator it = _pimpl->repos.find( info ); + if( it == repoEnd() ) + ZYPP_THROW(RepoNotFoundException(info)); + else + return *it; } //////////////////////////////////////////////////////////////////////////// @@ -1318,10 +1320,7 @@ const url::ViewOption & urlview, const ProgressData::ReceiverFnc & progressrcv ) { - std::list<RepoInfo> repos = knownRepositories(); - for ( std::list<RepoInfo>::const_iterator it = repos.begin(); - it != repos.end(); - ++it ) + for_( it, repoBegin(), repoEnd() ) { for(RepoInfo::urls_const_iterator urlit = (*it).baseUrlsBegin(); urlit != (*it).baseUrlsEnd(); @@ -1332,22 +1331,24 @@ } } RepoInfo info; - info.setAlias(info.alias()); info.setBaseUrl(url); ZYPP_THROW(RepoNotFoundException(info)); } - + void RepoManager::addService( const std::string& name, const Url& url ) { - Service service(name, url); + addService( Service(name,url) ); + } + void RepoManager::addService( const Service& service ) + { //check if service isn't already exist if( _pimpl->services.find(service)!= _pimpl->services.end() ) return; //TODO throw exception - _pimpl->services.insert( service ); + const Service& savedService = *(_pimpl->services.insert( service )).first; - _pimpl->saveService( service ); + _pimpl->saveService( savedService ); } void RepoManager::removeService( const string& name) @@ -1390,12 +1391,12 @@ } //now remove all repositories added by this service - for_( it, service.begin(), service.end() ) - removeRepository(getRepositoryInfo(*it)); + getRepositoriesInService( name, + boost::make_function_output_iterator(bind(&RepoManager::removeRepository, this, _1, ProgressData::ReceiverFnc()) ) ); } - void RepoManager::Impl::saveService( const Service& service ) + void RepoManager::Impl::saveService( const Service& service ) const { filesystem::assert_dir( options.knownServicesPath ); @@ -1411,7 +1412,7 @@ service.dumpServiceOn( file ); - service.setLocation( servfile ); + const_cast<Service&>(service).setLocation( servfile ); MIL << "done" << endl; } @@ -1450,15 +1451,83 @@ for (std::set<Service>::iterator it = _pimpl->services.begin(); it != _pimpl->services.end(); ++it) { - it->refresh(*this); + MIL << "refresh: "<<it->name() << " with url: "<< it->url().asString() << endl; + refreshService(*it); } } - void RepoManager::modifyService(const Service& service) const + void RepoManager::refreshService( const Service& service ) { - MIL << "Going to modify service " << service.name() << endl; + //download index file + media::MediaManager mediamanager; + media::MediaAccessId mid = mediamanager.open( service.url() ); + mediamanager.attachDesiredMedia( mid ); + mediamanager.provideFile( mid, "repo/repoindex.xml" ); + Pathname path = mediamanager.localPath(mid, "repo/repoindex.xml" ); - Pathname location = service.location(); + //parse it + RepoCollector collector; + parser::RepoindexFileReader reader( path, + bind( &RepoCollector::collect, &collector, _1 ) ); + mediamanager.release( mid ); + mediamanager.close( mid ); + + // set base url for all collected repositories + for_( it, collector.repos.begin(), collector.repos.end()) + { + it->setBaseUrl( service.url() ); + it->setService(service.name()); + } + + //compare old and new repositories (hope not to much, if it change + // then construct set and use set operation on it) + + std::list<RepoInfo> oldRepos; + getRepositoriesInService(service.name(), + insert_iterator<std::list<RepoInfo> > + (oldRepos,oldRepos.begin())); + + //find old to remove + for_( it, oldRepos.begin(), oldRepos.end() ) + { + bool found = false; + + for_( it2, collector.repos.begin(), collector.repos.end() ) + if ( it->alias() == it2->alias() ) + { + found = true; + break; + } + + if( !found ) + removeRepository( *it ); + } + + //find new to add + for_( it, collector.repos.begin(), collector.repos.end() ) + { + bool found = false; + + for_( it2, oldRepos.begin(), oldRepos.end() ) + if( it->alias() == it2->alias() ) + { + found = true; + break; + } + + if (!found) + addRepository( *it ); + } + + } + + void RepoManager::modifyService(const std::string& oldName, const Service& service) + { + MIL << "Going to modify service " << oldName << endl; + + const Service& oldService = getService(oldName); + + Pathname location = oldService.location(); if( location.empty() ) { ZYPP_THROW(RepoException("Can't figure where the service is stored")); @@ -1476,13 +1545,29 @@ for_(it, tmpSet.begin(), tmpSet.end()) { - if( *it != service ) + if( *it != oldName ) it->dumpServiceOn(file); } service.dumpServiceOn(file); file.close(); + + _pimpl->services.erase(oldName); + _pimpl->services.insert(service); + + if( oldName != service.name() ) //changed name, must change also repository + { + std::vector<RepoInfo> toModify; + getRepositoriesInService(oldName, + insert_iterator<std::vector<RepoInfo> >( toModify, toModify.begin() )); + for_( it, toModify.begin(), toModify.end() ) + { + it->setService(service.name()); + modifyRepository(it->alias(), *it); + } + } + } void RepoManager::Impl::knownServices() 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 Fri Jun 20 16:13:07 2008 @@ -15,6 +15,8 @@ #include <iosfwd> #include <list> +#include <boost/iterator.hpp> + #include "zypp/base/PtrTypes.h" #include "zypp/Pathname.h" #include "zypp/ZConfig.h" @@ -100,6 +102,11 @@ typedef ServiceSet::const_iterator ServiceConstIterator; typedef ServiceSet::size_type ServiceSizeType; + //RepoInfo typedefs + typedef std::set<RepoInfo> RepoSet; + typedef RepoSet::const_iterator RepoConstIterator; + typedef RepoSet::size_type RepoSizeType; + public: RepoManager( const RepoManagerOptions &options = RepoManagerOptions() ); /** Dtor */ @@ -129,9 +136,16 @@ * The known repositories are read from * \ref RepoManagerOptions::knownReposPath passed on the Ctor. * Which defaults to ZYpp global settings. + * \deprecated use iterator instead which read only one time directory * \return found list<RepoInfo> */ - std::list<RepoInfo> knownRepositories() const; + ZYPP_DEPRECATED std::list<RepoInfo> knownRepositories() const; + + bool repoEmpty() const; + RepoSizeType repoSize() const; + RepoConstIterator repoBegin() const; + RepoConstIterator repoEnd() const; + /** * \short Status of local metadata @@ -431,6 +445,7 @@ const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); void addService( const std::string& name, const Url& url ); + void addService( const Service& name ); void removeService( const std::string& name ); @@ -446,11 +461,35 @@ void refreshServices(); + void refreshService( const Service& name ); + /** - * modify service, except name change - * ( you need remove and add if you want change name ) + * modify service */ - void modifyService(const Service& service) const; + void modifyService(const std::string& oldName, const Service& service); + + struct MatchServiceName { + private: + std::string name; + public: + MatchServiceName( const std::string& name_ ) : name(name_) {} + bool match( const RepoInfo& info ) { return info.service()==name; } + }; + + /** + * fill to output iterator repositories in service name + */ + + template<typename OutputIterator> + void getRepositoriesInService( const std::string& name, OutputIterator out ) const + { + MatchServiceName filter(name); + + std::copy(boost::make_filter_iterator(bind(&MatchServiceName::match, + filter, _1),repoBegin(),repoEnd()), boost::make_filter_iterator( + bind(&MatchServiceName::match, filter, _1),repoEnd(),repoEnd()), + out ); + } protected: RepoStatus rawMetadataStatus( const RepoInfo &info ); Modified: trunk/libzypp/zypp/Service.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Service.cc?rev=1043… ============================================================================== --- trunk/libzypp/zypp/Service.cc (original) +++ trunk/libzypp/zypp/Service.cc Fri Jun 20 16:13:07 2008 @@ -24,13 +24,17 @@ class Service::Impl{ public: - RepoContainer repos; string name; Url url; Pathname loc; Impl() : name("") {}; Impl(const string& name_) : name(name_) {}; Impl(const string& name_, const Url& url_) : name(name_), url(url_) {}; + private: + friend Impl * rwcowClone<Impl>( const Impl * rhs ); + /** clone for RWCOW_pointer */ + Impl * clone() const + { return new Impl( *this ); } }; Service::Service() : _pimpl( new Impl() ) {}; @@ -42,115 +46,27 @@ const Service Service::noService; string Service::name() const { return _pimpl->name; } - Url Service::url() const { return _pimpl->url; } - void Service::setUrl( const Url& url ) { _pimpl->url = url; } + void Service::setName( const std::string& name ) { _pimpl->name = name; } - bool Service::empty() const { return _pimpl->repos.empty(); } - Service::size_type Service::size() const { return _pimpl->repos.size(); } - Service::const_iterator Service::begin() const { return _pimpl->repos.begin(); } - Service::const_iterator Service::end() const { return _pimpl->repos.end(); } + Url Service::url() const { return _pimpl->url; } - void Service::addRepo( const std::string& alias ) - { - _pimpl->repos.push_back(alias); - } + void Service::setUrl( const Url& url ) { _pimpl->url = url; } void Service::dumpServiceOn( std::ostream& str ) const { str << endl; str << "[" << name() << "]" << endl; str << "url = " << url() << endl; - for_( it, begin(), end() ) - { - str << "alias = " << *it << endl; - } str << endl; } - void Service::refresh( RepoManager& repomanager ) const - { - //download index file - media::MediaManager mediamanager; - media::MediaAccessId mid = mediamanager.open( url() ); - mediamanager.provideFile( mid, "repo/repoindex.xml" ); - Pathname path = mediamanager.localPath(mid, "repo/repoindex.xml" ); - - //parse it - RepoInfoCollector collector; - parser::RepoindexFileReader reader( path, - bind( &RepoInfoCollector::collect, &collector, _1 ) ); - mediamanager.close( mid ); - - bool ret = false; - - // set base url for all collected repositories - for_( it, collector.repos.begin(), collector.repos.end()) - { - it->setBaseUrl( url() ); - } - - //compare old and new repositories (hope not to much, if it change - // then construct set and use set operation on it) - - std::list<RepoInfo> krepos = repomanager.knownRepositories(); - - //find old to remove - for_( it, begin(), end() ) - { - bool found = false; - - for_( it2, collector.repos.begin(), collector.repos.end() ) - if ( *it == it2->alias() ) - { - found = true; - break; - } - - if( !found ) - { - ret = true; - repomanager.removeRepository( repomanager.getRepositoryInfo( *it ) ); - } - } - - //find new to add - for_( it, collector.repos.begin(), collector.repos.end() ) - { - bool found = false; - - for_( it2, begin(), end() ) - if( it->alias() == *it2 ) - { - found = true; - break; - } - - if (!found) - { - ret = true; - repomanager.addRepository( *it ); - } - } - - //update internal alias storage - if (ret) - { - _pimpl->repos.clear(); - for_( it, collector.repos.begin(), collector.repos.end() ) - { - _pimpl->repos.push_back(it->alias()); - } - repomanager.modifyService(*this); - } - } - Pathname Service::location() const { return _pimpl->loc; } - void Service::setLocation( const Pathname& location ) const + void Service::setLocation( const Pathname& location ) { _pimpl->loc = location; } Modified: trunk/libzypp/zypp/Service.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Service.h?rev=10433… ============================================================================== --- trunk/libzypp/zypp/Service.h (original) +++ trunk/libzypp/zypp/Service.h Fri Jun 20 16:13:07 2008 @@ -29,11 +29,6 @@ class Service { public: - typedef std::vector<std::string> RepoContainer; - typedef RepoContainer::const_iterator const_iterator; - typedef RepoContainer::size_type size_type; - - public: /** Default ctor creates \ref noService.*/ Service(); @@ -60,54 +55,24 @@ Pathname location() const; - void setLocation( const Pathname& location ) const; - - void setUrl( const Url& url ); - public: - /** Whether \ref Service contains solvables. */ - bool empty() const; - - /** Number of solvables in \ref Service. */ - size_type size() const; + void setLocation( const Pathname& location ); - /** Iterator to the first \ref Solvable. */ - const_iterator begin() const; + void setUrl( const Url& url ); - /** Iterator behind the last \ref Solvable. */ - const_iterator end() const; + void setName( const std::string& name ); public: /** - * Refreshes local information about service. - * It can addi, remove or modify repositories. - * it is const due to use Service in set or map and name doesn't change - */ - void refresh( RepoManager& repomanager) const; - - /** * Writes Service to stream in ".service" format */ void dumpServiceOn( std::ostream & str ) const; - /** - * set repositories by alias. - * Used only during local loading, for update repository use refresh - */ - template<typename InputIterator> - void setRepos(InputIterator begin, InputIterator end) - { - for_(it,begin,end) - addRepo(*it); - } - - void addRepo(const std::string& alias); - class Impl; private: - mutable RW_pointer<Impl> _pimpl; + RWCOW_pointer<Impl> _pimpl; }; /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/parser/RepoFileReader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/RepoFileRead… ============================================================================== --- trunk/libzypp/zypp/parser/RepoFileReader.cc (original) +++ trunk/libzypp/zypp/parser/RepoFileReader.cc Fri Jun 20 16:13:07 2008 @@ -74,6 +74,8 @@ info.setGpgCheck( str::strToTrue( it->second ) ); else if ( it->first == "keeppackages" ) info.setKeepPackages( str::strToTrue( it->second ) ); + else if ( it->first == "service" ) + info.setService( it->second ); else ERR << "Unknown attribute " << it->second << " ignored" << endl; } 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 Fri Jun 20 16:13:07 2008 @@ -56,8 +56,6 @@ //MIL << (*it).first << endl; if (it->first == "url" ) service.setUrl( Url (it->second) ); - else if ( it->first == "alias" ) - service.addRepo( it->second ); else ERR << "Unknown attribute " << it->second << " ignored" << endl; } -- 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] r10432 - in /branches/SuSE-Linux-11_0-Branch/libzypp: VERSION.cmake devel/devel.ma/NewPool.cc package/libzypp.changes tests/zypp/StringUtils_test.cc zypp/PublicKey.cc zypp/PublicKey.h
by mlandres＠svn.opensuse.org 20 Jun '08

20 Jun '08

Author: mlandres Date: Fri Jun 20 15:38:11 2008 New Revision: 10432 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10432&view=rev Log: Fix permanent duplication of gpg keys in the rpm database. (bnc #401259) Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake branches/SuSE-Linux-11_0-Branch/libzypp/devel/devel.ma/NewPool.cc branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes branches/SuSE-Linux-11_0-Branch/libzypp/tests/zypp/StringUtils_test.cc branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.cc branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.h Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake Fri Jun 20 15:38:11 2008 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "4") SET(LIBZYPP_MINOR "26") SET(LIBZYPP_COMPATMINOR "24") -SET(LIBZYPP_PATCH "4") +SET(LIBZYPP_PATCH "5") Modified: branches/SuSE-Linux-11_0-Branch/libzypp/devel/devel.ma/NewPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/devel/devel.ma/NewPool.cc (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/devel/devel.ma/NewPool.cc Fri Jun 20 15:38:11 2008 @@ -470,9 +470,6 @@ #undef OUTS } -namespace zypp -{ -} /****************************************************************** ** @@ -491,7 +488,7 @@ ResPool pool( ResPool::instance() ); sat::Pool satpool( sat::Pool::instance() ); - if ( 1 ) + if ( 0 ) { RepoManager repoManager( makeRepoManager( sysRoot ) ); RepoInfoList repos = repoManager.knownRepositories(); @@ -575,27 +572,15 @@ /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// - for_( it, pool.byKindBegin<Patch>(), pool.byKindEnd<Patch>() ) - { - MIL << *it << endl; - Patch::constPtr patch( asKind<Patch>(it->resolvable()) ); - if ( ! patch->message().empty() ) - DBG << patch->message() << endl; - it->status().setTransact( true, ResStatus::USER ); - } + KeyRing_Ptr p( getZYpp()->keyRing() ); + list<PublicKey> publicKeys( p->publicKeys() ); + list<PublicKey> trustedPublicKeys( p->trustedPublicKeys() ); - PoolItem pix ( getPi<Package>("amarok",Edition("1.4.9.1-4"),Arch("i586")) ); - MIL << pix << endl; - if ( pix ) + for_( it, trustedPublicKeys.begin(), trustedPublicKeys.end() ) { - pix.status().setTransact( true, ResStatus::USER ); + MIL << dump(*it) << endl; } - solve(); - vdumpPoolStats( USR << "Transacting:"<< endl, - make_filter_begin<resfilter::ByTransact>(pool), - make_filter_end<resfilter::ByTransact>(pool) ) << endl; - install(); /////////////////////////////////////////////////////////////////// INT << "===[END]============================================" << endl << endl; Modified: branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Fri Jun 20 15:38:11 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jun 20 15:31:57 CEST 2008 - ma(a)suse.de + +- Fix permanent duplication of gpg keys in the rpm database. Also + retrieve correct creation and expire dates. (bnc #401259) +- version 4.26.5 +- revision 10432 + +------------------------------------------------------------------- Thu Jun 19 17:46:04 CEST 2008 - ma(a)suse.de - Handle new patch messages and scripts in commit. Provide callbacks Modified: branches/SuSE-Linux-11_0-Branch/libzypp/tests/zypp/StringUtils_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/tests/zypp/StringUtils_test.cc (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/tests/zypp/StringUtils_test.cc Fri Jun 20 15:38:11 2008 @@ -12,6 +12,7 @@ using namespace std; using namespace zypp; +#undef DBG #define DBG cout void chk_splitFields( const std::string & line, unsigned num ) Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.cc (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.cc Fri Jun 20 15:38:11 2008 @@ -30,7 +30,7 @@ /////////////////////////////////////////////////////////////////// namespace zypp -{ ///////////////////////////////////////////////////////////////// +{ ///////////////////////////////////////////////////////////////// // // CLASS NAME : PublicKey::Impl // @@ -45,7 +45,7 @@ readFromFile(file); MIL << "Done reading key" << std::endl; } - + public: /** Offer default Impl. */ static shared_ptr<Impl> nullimpl() @@ -54,21 +54,21 @@ return _nullimpl; } - + std::string asString() const { return "[" + id() + "] [" + name() + "] [" + fingerprint() + "]"; } - + std::string armoredData() const { return _data; } - + std::string id() const { return _id; } - + std::string name() const { return _name; } - + std::string fingerprint() const { return _fingerprint; } @@ -77,67 +77,32 @@ Date expires() const { return _expires; } - + Pathname path() const - { + { return _data_file.path(); //return _data_file; } - - protected: - // create Date from a string in format YYYY-MM-DD - Date createDate(const std::string &datestr) - { - // empty input - if (datestr.empty()) - { - return Date(); - } - - tm date; - memset(&date, 0, sizeof(date)); - - try - { - // set the date - date.tm_year = str::strtonum<int>(std::string(datestr, 0, 4)) - 1900; // years since 1900 - date.tm_mon = str::strtonum<int>(std::string(datestr, 5, 2)) - 1; // months since January - date.tm_mday = str::strtonum<int>(std::string(datestr, 9, 2)); // day - } - catch(...) - { - WAR << "Cannot parse date string: " << datestr << std::endl; - return Date(); - } - - time_t time_epoch = ::mktime(&date); + protected: - return Date(time_epoch); - } - void readFromFile( const Pathname &keyfile) { PathInfo info(keyfile); - MIL << "Reading pubkey from " << keyfile << " of size " << info.size() << " and sha1 " << filesystem::checksum(keyfile, "sha1")<< endl; + MIL << "Reading pubkey from " << keyfile << " of size " << info.size() << " and sha1 " << filesystem::checksum(keyfile, "sha1")<< endl; if ( !info.isExist() ) ZYPP_THROW(Exception("Can't read public key from " + keyfile.asString() + ", file not found")); - + if ( copy( keyfile, _data_file.path() ) != 0 ) ZYPP_THROW(Exception("Can't copy public key data from " + keyfile.asString() + " to " + _data_file.path().asString() )); - - filesystem::TmpDir dir; - const char* argv[] = { "gpg", "-v", "--no-default-keyring", "--fixed-list-mode", - "--homedir", - dir.path().asString().c_str(), "--with-fingerprint", "--with-colons", "--quiet", @@ -149,57 +114,77 @@ _data_file.path().asString().c_str(), NULL }; - + ExternalProgram prog(argv,ExternalProgram::Discard_Stderr, false, -1, true); - + std::string line; - int count = 0; - int sig_count = 0; + bool sawpub = false; + bool sawsig = false; + + // pub:-:1024:17:A84EDAE89C800ACA:971961473:1214043198::-:SuSE Package Signing Key <build(a)suse.de>: + // fpr:::::::::79C179B2E1C820C1890F9994A84EDAE89C800ACA: + // sig:::17:A84EDAE89C800ACA:1087899198:::::[selfsig]::13x: + // sig:::17:9E40E310000AABA4:980442706::::[User ID not found]:10x: + // sig:::1:77B2E6003D25D3D9:980443247::::[User ID not found]:10x: + // sub:-:2048:16:197448E88495160C:971961490:1214043258::: [expires: 2008-06-21] + // sig:::17:A84EDAE89C800ACA:1087899258:::::[keybind]::18x: - // pub:-:1024:17:A84EDAE89C800ACA:2000-10-19:2008-06-21::-:SuSE Package Signing Key <build(a)suse.de>: - - for(line = prog.receiveLine(), count=0; !line.empty(); line = prog.receiveLine(), count++ ) + for ( line = prog.receiveLine(); !line.empty(); line = prog.receiveLine() ) { - std::vector<std::string> words; - str::splitFields( line, std::back_inserter(words), ":" ); - - //MIL << "words size: " << words.size() << endl; - - - if( ! words.size() > 0 ) - continue; - + // trim trailing NL. + if ( line.empty() ) + continue; + if ( line[line.size()-1] == '\n' ) + line.erase( line.size()-1 ); + + // split at ':' + std::vector<std::string> words; + str::splitFields( line, std::back_inserter(words), ":" ); + if( words.empty() ) + continue; + if ( words[0] == "pub" ) { - _id = words[4]; - _name = words[9]; - //replace all escaped semicolon with real - str::replace_all(_name,"\\x3a",":"); - - //_expires = createDate(what[7]); - //return key; + if ( sawpub ) + continue; + sawpub = true; + // take default from pub + _id = words[4]; + _name = words[9]; + _created = Date(str::strtonum<Date::ValueType>(words[5])); + _expires = Date(str::strtonum<Date::ValueType>(words[6])); + + } + else if ( words[0] == "sig" ) + { + if ( sawsig || words[words.size()-2] != "13x" ) + continue; + sawsig = true; + // update creation and expire dates from 1st signature type "13x" + if ( ! words[5].empty() ) + _created = Date(str::strtonum<Date::ValueType>(words[5])); + if ( ! words[6].empty() ) + _expires = Date(str::strtonum<Date::ValueType>(words[6])); } else if ( words[0] == "fpr" ) { - _fingerprint = words[9]; + _fingerprint = words[9]; } - else if ( words[0] == "sig" && sig_count == 0 && words[10] == "[selfsig]" ) + else if ( words[0] == "uid" ) { - //MIL << "accept: " << line << endl; - - //sig:::17:A84EDAE89C800ACA:1087899198:::::[selfsig]::13x: - _created = Date(str::strtonum<Date::ValueType>(words[5])); - sig_count++; + if ( ! words[9].empty() ) + _name = words[9]; } - - //dumpRegexpResults(what); } prog.close(); - - if (_id.size() == 0 ) - ZYPP_THROW(BadKeyException("File " + keyfile.asString() + " doesn't contain public key data" , keyfile)); + + if ( _id.size() == 0 ) + ZYPP_THROW( BadKeyException( "File " + keyfile.asString() + " doesn't contain public key data" , keyfile ) ); + + //replace all escaped semicolon with real ':' + str::replace_all( _name, "\\x3a", ":" ); } - + private: std::string _id; std::string _name; @@ -247,16 +232,16 @@ { return _pimpl->asString(); } - + std::string PublicKey::armoredData() const { return _pimpl->armoredData(); } - + std::string PublicKey::id() const { return _pimpl->id(); } - + std::string PublicKey::name() const { return _pimpl->name(); } - + std::string PublicKey::fingerprint() const { return _pimpl->fingerprint(); } @@ -265,7 +250,7 @@ Date PublicKey::expires() const { return _pimpl->expires(); } - + Pathname PublicKey::path() const { return _pimpl->path(); } @@ -273,12 +258,23 @@ { return (b.id() == id()) && (b.fingerprint() == fingerprint() ); } - + bool PublicKey::operator==( std::string sid ) const { return sid == id(); } - + + std::ostream & dumpOn( std::ostream & str, const PublicKey & obj ) + { + str << "[" << obj.name() << "]" << endl; + str << " fpr " << obj.fingerprint() << endl; + str << " id " << obj.id() << endl; + str << " cre " << obj.created() << endl; + str << " exp " << obj.expires() << endl; + str << "]"; + return str; + } + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.h (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.h Fri Jun 20 15:38:11 2008 @@ -25,7 +25,7 @@ /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// - + /** * Exception thrown when the supplied key is * not a valid gpg key @@ -39,10 +39,10 @@ BadKeyException() : Exception( "Bad Key Exception" ) {} - + Pathname keyFile() const { return _keyfile; } - + /** Ctor taking message. * Use \ref ZYPP_THROW to throw exceptions. */ @@ -54,16 +54,16 @@ private: Pathname _keyfile; }; - - // forward declaration of class Date + + // forward declaration of class Date class Date; /////////////////////////////////////////////////////////////////// // // CLASS NAME : PublicKey // - /** + /** * Class that represent a GPG Public Key */ class PublicKey @@ -76,16 +76,16 @@ public: PublicKey(); - /** Ctor + /** Ctor * \throws when data does not make a key */ PublicKey(const Pathname &file); - + ~PublicKey(); - + bool isValid() const { return ( ! id().empty() && ! fingerprint().empty() && !path().empty() ); } - + std::string asString() const; std::string armoredData() const; std::string id() const; @@ -94,7 +94,7 @@ /** * Date when the key was created (time is 00:00:00) - */ + */ Date created() const; /** @@ -103,11 +103,11 @@ */ Date expires() const; - Pathname path() const; - + Pathname path() const; + bool operator==( PublicKey b ) const; bool operator==( std::string sid ) const; - + private: /** Pointer to implementation */ RWCOW_pointer<Impl> _pimpl; @@ -118,7 +118,10 @@ inline std::ostream & operator<<( std::ostream & str, const PublicKey & obj ) { return str << obj.asString(); } - ///////////////////////////////////////////////////////////////// + /** \relates PublicKey Detailed stream output */ + std::ostream & dumpOn( std::ostream & str, const PublicKey & obj ); + + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// #endif // ZYPP_PUBLICKEY_H -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0