[zypp-commit] r8446 - in /branches/tmp/ma/jump_sat/libzypp: tests/zypp/ zypp/ zypp/target/ zypp/zypp_detail/

Author: dmacvicar Date: Sat Feb 2 04:32:33 2008 New Revision: 8446 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8446&view=rev Log: remove some interfaces, cleanup Modified: branches/tmp/ma/jump_sat/libzypp/tests/zypp/RepoStatus_test.cc branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc branches/tmp/ma/jump_sat/libzypp/zypp/Target.cc branches/tmp/ma/jump_sat/libzypp/zypp/Target.h branches/tmp/ma/jump_sat/libzypp/zypp/target/TargetImpl.cc branches/tmp/ma/jump_sat/libzypp/zypp/target/TargetImpl.h branches/tmp/ma/jump_sat/libzypp/zypp/zypp_detail/ZYppImpl.cc Modified: branches/tmp/ma/jump_sat/libzypp/tests/zypp/RepoStatus_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests/zypp/RepoStatus_test.cc?rev=8446&r1=8445&r2=8446&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/tests/zypp/RepoStatus_test.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/tests/zypp/RepoStatus_test.cc Sat Feb 2 04:32:33 2008 @@ -16,7 +16,6 @@ using namespace std; using namespace zypp; using namespace zypp::filesystem; -using namespace zypp::repo; void repostatus_test() { Modified: branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc?rev=8446&r1=8445&r2=8446&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc Sat Feb 2 04:32:33 2008 @@ -740,11 +740,6 @@ case RepoType::RPMMD_e : case RepoType::YAST2_e : { -// string cmd = "repo2solv.sh \""; -// cmd += rawpath.asString() + "\" > " + solvfile.asString(); -// int ret = system (cmd.c_str()); -// if (WIFEXITED (ret) && WEXITSTATUS (ret) != 0) -// ZYPP_THROW(RepoUnknownTypeException()); MIL << "Executing solv converter" << endl; string cmd( str::form( "/usr/bin/repo2solv.sh \"%s\" > %s", rawpath.asString().c_str(), solvfile.asString().c_str() ) ); ExternalProgram prog( cmd, ExternalProgram::Stderr_To_Stdout ); @@ -752,6 +747,8 @@ MIL << " " << output; } int ret = prog.close(); + if ( ret != 0 ) + ZYPP_THROW(RepoUnknownTypeException()); } break; default: Modified: branches/tmp/ma/jump_sat/libzypp/zypp/Target.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/Target.cc?rev=8446&r1=8445&r2=8446&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/Target.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/Target.cc Sat Feb 2 04:32:33 2008 @@ -67,9 +67,6 @@ void Target::load() { _pimpl->load(); } - const ResStore & Target::resolvables() - { return _pimpl->resolvables(); } - ResStore::resfilter_const_iterator Target::byKindBegin( const ResObject::Kind & kind_r ) const { return _pimpl->byKindBegin( kind_r ); } @@ -79,15 +76,6 @@ target::rpm::RpmDb & Target::rpmDb() { return _pimpl->rpm(); } -#ifndef STORAGE_DISABLED - /** enables the storage target */ - bool Target::isStorageEnabled() const - { return _pimpl->isStorageEnabled(); } - - void Target::enableStorage(const Pathname &root_r) - { _pimpl->enableStorage(root_r); } -#endif - Pathname Target::root() const { return _pimpl->root(); } Modified: branches/tmp/ma/jump_sat/libzypp/zypp/Target.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/Target.h?rev=8446&r1=8445&r2=8446&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/Target.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/Target.h Sat Feb 2 04:32:33 2008 @@ -55,9 +55,6 @@ public: - /** All resolvables provided by the target. */ - const ResStore & resolvables(); - /** * load resolvables into the pool */ @@ -92,12 +89,6 @@ ResObject::constPtr whoOwnsFile (const std::string & path_str) const; -#ifndef STORAGE_DISABLED - /** enables the storage target */ - bool isStorageEnabled() const; - void enableStorage(const Pathname &root_r); -#endif - /** Set the log file for target */ bool setInstallationLogfile(const Pathname & path_r); Modified: branches/tmp/ma/jump_sat/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/target/TargetImpl.cc?rev=8446&r1=8445&r2=8446&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/target/TargetImpl.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/target/TargetImpl.cc Sat Feb 2 04:32:33 2008 @@ -281,7 +281,7 @@ // METHOD TYPE : Ctor // TargetImpl::TargetImpl(const Pathname & root_r) - : _root(root_r), _storage_enabled(false) + : _root(root_r) { _rpm.initDatabase(root_r); MIL << "Initialized target on " << _root << endl; @@ -298,11 +298,6 @@ MIL << "Targets closed" << endl; } - bool TargetImpl::isStorageEnabled() const - { - return _storage_enabled; - } - void TargetImpl::load() { Pathname rpmsolv = _root + ZConfig::instance().repoCachePath() + "_rpm.solv"; @@ -344,24 +339,14 @@ MIL << "Target loaded: " << system.solvablesSize() << " resolvables" << endl; } - void TargetImpl::enableStorage(const Pathname &root_r) - { - } - Pathname TargetImpl::root() const { return _root; } - void TargetImpl::loadKindResolvables( const Resolvable::Kind kind ) - { - // FIXME remove this - } - ResStore::resfilter_const_iterator TargetImpl::byKindBegin( const ResObject::Kind & kind_r ) const { TargetImpl *ptr = const_cast(this); - ptr->loadKindResolvables(kind_r); resfilter::ResFilter filter = ByKind(kind_r); return make_filter_iterator( filter, _store.begin(), _store.end() ); } @@ -369,16 +354,10 @@ ResStore::resfilter_const_iterator TargetImpl::byKindEnd( const ResObject::Kind & kind_r ) const { TargetImpl *ptr = const_cast(this); - ptr->loadKindResolvables(kind_r); resfilter::ResFilter filter = ByKind(kind_r); return make_filter_iterator( filter, _store.end(), _store.end() ); } - const ResStore & TargetImpl::resolvables() - { - return _store; - } - void TargetImpl::reset() { // FIXME remove Modified: branches/tmp/ma/jump_sat/libzypp/zypp/target/TargetImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/target/TargetImpl.h?rev=8446&r1=8445&r2=8446&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/target/TargetImpl.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/target/TargetImpl.h Sat Feb 2 04:32:33 2008 @@ -73,9 +73,6 @@ public: - /** All resolvables in the target. */ - const ResStore & resolvables(); - /** * load resolvables of certain kind in the internal store * and return a iterator @@ -105,10 +102,6 @@ return res._result; } - /** enables the storage target */ - bool isStorageEnabled() const; - void enableStorage(const Pathname &root_r); - /** Commit ordered changes * @param pool_r only needed for #160792 * @return uncommitted ones (due to error) @@ -151,18 +144,12 @@ void reset(); protected: - void loadKindResolvables( const Resolvable::Kind kind ); /** All resolvables provided by the target. */ ResStore _store; /** Path to the target */ Pathname _root; /** RPM database */ rpm::RpmDb _rpm; -#ifndef STORAGE_DISABLED - zypp::storage::PersistentStorage _storage; - bool _storage_enabled; - std::map< const Resolvable::Kind, DefaultFalseBool> _resstore_loaded; -#endif private: /** Null implementation */ static TargetImpl_Ptr _nullimpl; Modified: branches/tmp/ma/jump_sat/libzypp/zypp/zypp_detail/ZYppImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/zypp_detail/ZYppImpl.cc?rev=8446&r1=8445&r2=8446&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/zypp_detail/ZYppImpl.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/zypp_detail/ZYppImpl.cc Sat Feb 2 04:32:33 2008 @@ -216,7 +216,6 @@ #endif } _target = new Target( root ); - _target->enableStorage( root ); } void ZYppImpl::finishTarget() -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org