Author: matz Date: Fri Oct 19 11:51:11 2007 New Revision: 7567 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7567&view=rev Log: Axing everything all over the place to make it compile and link again. Funnily enough "zypper lu" still sort of works, just the importing of gpg-pubkey-* is strange. Modified: branches/use-solv/libzypp/zypp/CMakeLists.txt branches/use-solv/libzypp/zypp/CapFactory.h branches/use-solv/libzypp/zypp/Language.cc branches/use-solv/libzypp/zypp/Locks.cc branches/use-solv/libzypp/zypp/RepoManager.cc branches/use-solv/libzypp/zypp/SystemResObject.cc branches/use-solv/libzypp/zypp/TODO.use-solv branches/use-solv/libzypp/zypp/capability/CapabilityImpl.cc branches/use-solv/libzypp/zypp/capability/CapabilityImpl.h branches/use-solv/libzypp/zypp/detail/ResolvableImpl.cc branches/use-solv/libzypp/zypp/parser/susetags/ContentFileReader.cc branches/use-solv/libzypp/zypp/repo/cached/PatternImpl.cc branches/use-solv/libzypp/zypp/solver/detail/QueueItemConflict.cc branches/use-solv/libzypp/zypp/solver/detail/QueueItemRequire.cc branches/use-solv/libzypp/zypp/solver/detail/QueueItemUninstall.cc branches/use-solv/libzypp/zypp/solver/detail/ResolverUpgrade.cc branches/use-solv/libzypp/zypp/target/rpm/RpmDb.cc branches/use-solv/libzypp/zypp/target/store/XMLFilesBackend.cc Modified: branches/use-solv/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/CMakeLists.txt?rev=7567&r1=7566&r2=7567&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/CMakeLists.txt (original) +++ branches/use-solv/libzypp/zypp/CMakeLists.txt Fri Oct 19 11:51:11 2007 @@ -450,11 +450,11 @@ SET( zypp_parser_susetags_SRCS parser/susetags/RepoIndex.cc parser/susetags/ContentFileReader.cc - parser/susetags/PackagesFileReader.cc - parser/susetags/PackagesLangFileReader.cc - parser/susetags/PackagesDuFileReader.cc - parser/susetags/PatternFileReader.cc - parser/susetags/RepoParser.cc + #parser/susetags/PackagesFileReader.cc + #parser/susetags/PackagesLangFileReader.cc + #parser/susetags/PackagesDuFileReader.cc + #parser/susetags/PatternFileReader.cc + #parser/susetags/RepoParser.cc ) SET( zypp_parser_susetags_HEADERS @@ -541,7 +541,7 @@ SET( zypp_parser_yum_SRCS #parser/yum/RepoParser.cc - parser/yum/FileReaderBaseImpl.cc + #parser/yum/FileReaderBaseImpl.cc parser/yum/RepomdFileReader.cc parser/yum/PatchesFileReader.cc #parser/yum/PrimaryFileReader.cc @@ -1035,7 +1035,7 @@ ${zypp_cache_SRCS} ${zypp_cache_sqlite3x_SRCS} ${zypp_pool_SRCS} -#${zypp_parser_susetags_SRCS} +${zypp_parser_susetags_SRCS} ${zypp_parser_xmlstore_SRCS} ${zypp_parser_xml_SRCS} ${zypp_parser_yum_SRCS} Modified: branches/use-solv/libzypp/zypp/CapFactory.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/CapFactory.h?rev=7567&r1=7566&r2=7567&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/CapFactory.h (original) +++ branches/use-solv/libzypp/zypp/CapFactory.h Fri Oct 19 11:51:11 2007 @@ -54,6 +54,7 @@ */ Capability fromImpl( capability::CapabilityImpl::Ptr impl ) const; +#if 0 /** Parse Capability from string providing Resolvable::Kind. * \a strval_r is expected to define a valid Capability. * \throw EXCEPTION on parse error. @@ -96,6 +97,7 @@ * capabilities when matched. */ Capability filesystemEvalCap() const; +#endif public: /** Provide a parsable string representation of \a cap_r. */ Modified: branches/use-solv/libzypp/zypp/Language.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/Language.cc?rev=7567&r1=7566&r2=7567&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/Language.cc (original) +++ branches/use-solv/libzypp/zypp/Language.cc Fri Oct 19 11:51:11 2007 @@ -85,8 +85,10 @@ { // Recommend fallback Language Locale fallback( locale_r.fallback() ); +#if 0 if ( fallback != Locale::noCode ) dataCollect[Dep::RECOMMENDS].insert( CapFactory().parse( ResTraits<Language>::kind, fallback.code() ) ); +#endif } ret = _ptrmap[locale_r] = detail::makeResolvableFromImpl( dataCollect, langImpl ); @@ -107,8 +109,10 @@ { // Recommend fallback Language Locale fallback( locale_r.fallback() ); +#if 0 if ( fallback != Locale::noCode ) dataCollect[Dep::RECOMMENDS].insert( CapFactory().parse( ResTraits<Language>::kind, fallback.code() ) ); +#endif } ret = _ptrmap[locale_r] = detail::makeResolvableFromImpl( dataCollect, langImpl ); Modified: branches/use-solv/libzypp/zypp/Locks.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/Locks.cc?rev=7567&r1=7566&r2=7567&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/Locks.cc (original) +++ branches/use-solv/libzypp/zypp/Locks.cc Fri Oct 19 11:51:11 2007 @@ -132,6 +132,7 @@ if ( line.empty() || line[0] == '#') return true; +#if 0 MIL << "Applying locks from pattern '" << str_r << "'" << endl; // zypp does not provide wildcard or regex support in the Capability matching helpers @@ -220,6 +221,7 @@ } ++_count; } +#endif return true; } // end operator()() Modified: branches/use-solv/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/RepoManager.cc?rev=7567&r1=7566&r2=7567&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/RepoManager.cc (original) +++ branches/use-solv/libzypp/zypp/RepoManager.cc Fri Oct 19 11:51:11 2007 @@ -35,7 +35,7 @@ #include "zypp/parser/RepoFileReader.h" #include "zypp/repo/yum/Downloader.h" #include "zypp/parser/yum/RepoParser.h" -#include "zypp/parser/plaindir/RepoParser.h" +//#include "zypp/parser/plaindir/RepoParser.h" #include "zypp/repo/susetags/Downloader.h" #include "zypp/parser/susetags/RepoParser.h" @@ -490,6 +490,7 @@ return refresh; } +#if 0 else if ( repokind.toEnum() == RepoType::RPMPLAINDIR_e ) { RepoStatus newstatus = parser::plaindir::dirStatus(url.getPathName()); @@ -514,6 +515,7 @@ return refresh; } +#endif else { ZYPP_THROW(RepoUnknownTypeException()); @@ -599,6 +601,7 @@ downloader_ptr->download( media, tmpdir.path()); } +#if 0 else if ( repokind.toEnum() == RepoType::RPMPLAINDIR_e ) { RepoStatus newstatus = parser::plaindir::dirStatus(url.getPathName()); @@ -612,6 +615,7 @@ file.close(); } +#endif else { ZYPP_THROW(RepoUnknownTypeException()); @@ -764,6 +768,7 @@ // no error } break; +#if 0 case RepoType::RPMPLAINDIR_e : { CombinedProgressData subprogrcv( progress, 100); @@ -775,6 +780,7 @@ parser.parse(url.getPathName()); } break; +#endif default: ZYPP_THROW(RepoUnknownTypeException()); } Modified: branches/use-solv/libzypp/zypp/SystemResObject.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/SystemResObject.cc?rev=7567&r1=7566&r2=7567&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/SystemResObject.cc (original) +++ branches/use-solv/libzypp/zypp/SystemResObject.cc Fri Oct 19 11:51:11 2007 @@ -51,9 +51,9 @@ if ( ! _ptr ) { NVRAD dataCollect( "system" ); - dataCollect[Dep::PROVIDES].insert( CapFactory().halEvalCap() ); + /*dataCollect[Dep::PROVIDES].insert( CapFactory().halEvalCap() ); dataCollect[Dep::PROVIDES].insert( CapFactory().modaliasEvalCap() ); - dataCollect[Dep::PROVIDES].insert( CapFactory().filesystemEvalCap() ); + dataCollect[Dep::PROVIDES].insert( CapFactory().filesystemEvalCap() );*/ detail::ResImplTraitsdetail::SystemResObjectImplIf::Ptr sysImpl; _ptr = detail::makeResolvableAndImpl( dataCollect, sysImpl ); Modified: branches/use-solv/libzypp/zypp/TODO.use-solv URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/TODO.use-solv?rev=7567&r1=7566&r2=7567&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/TODO.use-solv (original) +++ branches/use-solv/libzypp/zypp/TODO.use-solv Fri Oct 19 11:51:11 2007 @@ -7,11 +7,15 @@ ResolvableQuery: remove or new interface to different structure CacheStore: complete overhaul, or remove parser/{susetags,yum}/ : remove +parser/*/ : But either retain the base parsers (content file e.g.), or + somehow integrate this into the bla2solv converters +parser/plaindir : write plaindir2solv, use that cached/RepoImpl::createPatchAndDeltas : do we need this still? Perhaps replace with filter iterator over solvables? repo/cached/PackageImpl::sourcePkgEdition : replace with something, perhaps just returning a string? repo/cached/ProductImpl::distributionEdition : same +repo/cached/PatternImpl: remove target/store/XMLFilesBackend.cc : Needs overhaul and has to insert it's resolvables into the system source target/rpm/RpmDb::exportTrustedKeysInZyppKeyRing : look over gpg-key @@ -21,3 +25,16 @@ target/rpm/RpmHeader::PkgRelList_val : Should not be needed. solver/detail/Testcase.cc : Edition handling, remove some commented out code. SysContent.cc : ConsumeEdition: writes out and reads in Edition as string +SystemResObject.cc : the "system" object provides empty hal/filesys/modalias + caps? +solver/detail/QueueItemConflict.cc : uses factory.parse +solver/detail/QueueItemRequire.cc : same +solver/detail/QueueItemUninstall.cc : same +solver/detail/ResolverUpgrade.cc : same +detail/ResolvableImpl.cc : uses factory.parse extensively for filtering Caps. + Needless. +Language.cc : uses factory.parse to generate a language dep (Cap) +Locks.cc : uses factory.parse to install the locks +target/store/XMLFilesBackend.cc : uses factory.parse to add requires from + patch to atoms, and in XMLFilesBackend::createCapability +target/rpm/RpmDb : uses factory.parse for fiddling with filereqs Modified: branches/use-solv/libzypp/zypp/capability/CapabilityImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/capability/CapabilityImpl.cc?rev=7567&r1=7566&r2=7567&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/capability/CapabilityImpl.cc (original) +++ branches/use-solv/libzypp/zypp/capability/CapabilityImpl.cc Fri Oct 19 11:51:11 2007 @@ -394,6 +394,13 @@ } #endif + CapabilityImpl::Ptr slow_parse( const Resolvable::Kind & refers_r, + const std::string & strval_r ) + { + cerr << "AIEEE! capability::slow_parse called" << endl; + return NULL; + } + /////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////// Modified: branches/use-solv/libzypp/zypp/capability/CapabilityImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/capability/CapabilityImpl.h?rev=7567&r1=7566&r2=7567&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/capability/CapabilityImpl.h (original) +++ branches/use-solv/libzypp/zypp/capability/CapabilityImpl.h Fri Oct 19 11:51:11 2007 @@ -266,10 +266,10 @@ /////////////////////////////////////////////////////////////////// - /*CapabilityImpl::Ptr parse( const Resolvable::Kind & refers_r, + CapabilityImpl::Ptr slow_parse( const Resolvable::Kind & refers_r, const std::string & strval_r ); - CapabilityImpl::Ptr parse( const Resolvable::Kind & refers_r, + /*CapabilityImpl::Ptr parse( const Resolvable::Kind & refers_r, const std::string & name_r, const std::string & op_r, const std::string & edition_r ); Modified: branches/use-solv/libzypp/zypp/detail/ResolvableImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/detail/ResolvableImpl.cc?rev=7567&r1=7566&r2=7567&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/detail/ResolvableImpl.cc (original) +++ branches/use-solv/libzypp/zypp/detail/ResolvableImpl.cc Fri Oct 19 11:51:11 2007 @@ -50,6 +50,7 @@ namespace { +#if 0 struct FilterExtraDependency { Dependencies & deps; @@ -173,6 +174,7 @@ flp ); to[Dep::SUPPLEMENTS].insert(supplements.begin(), supplements.end()); } +#endif // rewrite dependencies from // kernel(xxx) = yyy @@ -206,6 +208,7 @@ return ""; } +#if 0 void rewriteKernelDeps( Dependencies & deps ) { // check the smaller set (requires) first @@ -243,6 +246,7 @@ } return; } +#endif } @@ -263,10 +267,11 @@ // and split them up to freshens/supplements (except for SystemResObject) if ( _kind != ResTraits<SystemResObject>::kind ) { - filterExtraSupplements( nvrad_r, _deps ); - filterExtraProvides( nvrad_r, _deps ); + //filterExtraSupplements( nvrad_r, _deps ); + //filterExtraProvides( nvrad_r, _deps ); } +#if 0 // remove malicious self provides CapSet::iterator it = _deps[Dep::PROVIDES].find( CapFactory().parse( _kind, _name ) ); if ( it != _deps[Dep::PROVIDES].end() ) @@ -278,6 +283,7 @@ // assert self provides _deps[Dep::PROVIDES].insert( CapFactory() .parse( _kind, _name, Rel::EQ, _edition ) ); +#endif // Filter 'rpmlib(...)' requirements (refill from nvrad_r) filterUnwantedReq( nvrad_r[Dep::PREREQUIRES], _deps[Dep::PREREQUIRES] ); @@ -286,7 +292,7 @@ // check for kernel(xxx) and rewrite them to kernel(flavor:xxx) if ( _kind == ResTraits<Package>::kind ) { - rewriteKernelDeps( _deps ); + //rewriteKernelDeps( _deps ); } // assert all prerequires are in requires too Modified: branches/use-solv/libzypp/zypp/parser/susetags/ContentFileReader.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/parser/susetags/ContentFileReader.cc?rev=7567&r1=7566&r2=7567&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/parser/susetags/ContentFileReader.cc (original) +++ branches/use-solv/libzypp/zypp/parser/susetags/ContentFileReader.cc Fri Oct 19 11:51:11 2007 @@ -172,7 +172,7 @@ } // Add the dependency - deplist_r.insert( capability::parse( kind, name ) ); + deplist_r.insert( capability::slow_parse( kind, name ) ); } } @@ -338,7 +338,9 @@ } else if ( key == "VERSION" ) { - _pimpl->product().edition = value; + //_pimpl->product().edition = value; + // XXX need Edition from string + _pimpl->product().edition = Edition(); } else if ( key == "ARCH" ) { @@ -358,7 +360,9 @@ } else if ( key == "DISTVERSION" ) { - _pimpl->product().distributionEdition = value; + //_pimpl->product().distributionEdition = value; + // XXX + _pimpl->product().distributionEdition = Edition(); } else if ( key == "VENDOR" ) { @@ -523,11 +527,12 @@ // Insert a "Provides" _dist_name" == _dist_version" if ( ! _pimpl->product().distributionName.empty() ) { - _pimpl->product().deps[Dep::PROVIDES].insert( + // XXX + /*_pimpl->product().deps[Dep::PROVIDES].insert( capability::parse( ResTraits<Product>::kind, _pimpl->product().distributionName, Rel::EQ, - _pimpl->product().distributionEdition ) ); + _pimpl->product().distributionEdition ) );*/ } } if ( ! ticks.toMax() ) Modified: branches/use-solv/libzypp/zypp/repo/cached/PatternImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/repo/cached/PatternImpl.cc?rev=7567&r1=7566&r2=7567&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/repo/cached/PatternImpl.cc (original) +++ branches/use-solv/libzypp/zypp/repo/cached/PatternImpl.cc Fri Oct 19 11:51:11 2007 @@ -145,7 +145,8 @@ _repository->resolvableQuery().queryStringContainerAttribute( _id, attr_r, std::back_inserter(capstr) ); for_( it, capstr.begin(), capstr.end() ) { - caps_r.insert( CapFactory().parse<ResType>( *it ) ); + //caps_r.insert( CapFactory().parse<ResType>( *it ) ); + cerr << "AIEEEE! want to parse a cap for PatternImpl" << endl; } } Modified: branches/use-solv/libzypp/zypp/solver/detail/QueueItemConflict.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/solver/detail/QueueItemConflict.cc?rev=7567&r1=7566&r2=7567&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/solver/detail/QueueItemConflict.cc (original) +++ branches/use-solv/libzypp/zypp/solver/detail/QueueItemConflict.cc Fri Oct 19 11:51:11 2007 @@ -227,7 +227,9 @@ UpgradeCandidate upgrade_info (provider, context); - Capability maybe_upgrade_cap = factory.parse ( provider->kind(), provider->name(), Rel::ANY, Edition::noedition ); + //Capability maybe_upgrade_cap = factory.parse ( provider->kind(), provider->name(), Rel::ANY, Edition::noedition ); + // XXX + Capability maybe_upgrade_cap; // pool->foreachProvidingResItem (maybe_upgrade_dep, upgrade_candidates_cb, (void *)&upgrade_info); Dep dep( Dep::PROVIDES ); Modified: branches/use-solv/libzypp/zypp/solver/detail/QueueItemRequire.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/solver/detail/QueueItemRequire.cc?rev=7567&r1=7566&r2=7567&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/solver/detail/QueueItemRequire.cc (original) +++ branches/use-solv/libzypp/zypp/solver/detail/QueueItemRequire.cc Fri Oct 19 11:51:11 2007 @@ -736,6 +736,7 @@ bool nameFit = false; CapFactory factory; +#if 0 if (isKindcapability::NamedCap( _capability ) ) { Capability capTest = factory.parse ( (*it)->kind(), (*it)->name(), Rel::ANY, Edition::noedition ); if (capTest.matches (_capability) == CapMatch::yes) { @@ -744,6 +745,7 @@ _XDEBUG(" --> do not trow away althout it could have the wrong architecture"); } } +#endif next = it; ++next; if ((*it)->arch() != bestArch Modified: branches/use-solv/libzypp/zypp/solver/detail/QueueItemUninstall.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/solver/detail/QueueItemUninstall.cc?rev=7567&r1=7566&r2=7567&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/solver/detail/QueueItemUninstall.cc (original) +++ branches/use-solv/libzypp/zypp/solver/detail/QueueItemUninstall.cc Fri Oct 19 11:51:11 2007 @@ -457,11 +457,12 @@ for (Patch::AtomList::const_iterator it = atoms.begin(); it != atoms.end(); ++it) { Resolvable::constPtr res = *it; - Capability capAtom = factory.parse ( res->kind(), res->name(), Rel::EQ, res->edition()); + // XXX + /*Capability capAtom = factory.parse ( res->kind(), res->name(), Rel::EQ, res->edition()); invokeOnEach( pool().byCapabilityIndexBegin( capAtom.index(), dep ), pool().byCapabilityIndexEnd( capAtom.index(), dep ), functor::chain( resfilter::ByCaIInstalled(), resfilter::ByCapMatch( capAtom ) ), - functor::functorRef( callback ) ); + functor::functorRef( callback ) );*/ } } Modified: branches/use-solv/libzypp/zypp/solver/detail/ResolverUpgrade.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/solver/detail/ResolverUpgrade.cc?rev=7567&r1=7566&r2=7567&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/solver/detail/ResolverUpgrade.cc (original) +++ branches/use-solv/libzypp/zypp/solver/detail/ResolverUpgrade.cc Fri Oct 19 11:51:11 2007 @@ -186,10 +186,14 @@ bool Resolver::doesObsoleteItem (PoolItem_Ref candidate, PoolItem_Ref installed) { + return false; + // XXX +#if 0 CapFactory factory; Capability installedCap = factory.parse ( installed->kind(), installed->name(), Rel::EQ, installed->edition()); return doesObsoleteCapability (candidate, installedCap); +#endif } //----------------------------------------------------------------------------- @@ -596,7 +600,9 @@ Dep dep (Dep::PROVIDES); CapFactory factory; - Capability installedCap = factory.parse( installed->kind(), installed->name(), Rel::GE, installed->edition() ); + //Capability installedCap = factory.parse( installed->kind(), installed->name(), Rel::GE, installed->edition() ); + // XXX + Capability installedCap; FindProviders info(installed); Modified: branches/use-solv/libzypp/zypp/target/rpm/RpmDb.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/target/rpm/RpmDb.cc?rev=7567&r1=7566&r2=7567&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/target/rpm/RpmDb.cc (original) +++ branches/use-solv/libzypp/zypp/target/rpm/RpmDb.cc Fri Oct 19 11:51:11 2007 @@ -1499,6 +1499,7 @@ _packages.buildIndex(); DBG << "Found installed packages: " << _packages._list.size() << endl; +#if 0 /////////////////////////////////////////////////////////////////// // Evaluate filerequires collected so far /////////////////////////////////////////////////////////////////// @@ -1517,6 +1518,7 @@ } } +#endif /////////////////////////////////////////////////////////////////// // Build final packages list Modified: branches/use-solv/libzypp/zypp/target/store/XMLFilesBackend.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/target/store/XMLFilesBackend.cc?rev=7567&r1=7566&r2=7567&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/target/store/XMLFilesBackend.cc (original) +++ branches/use-solv/libzypp/zypp/target/store/XMLFilesBackend.cc Fri Oct 19 11:51:11 2007 @@ -842,8 +842,9 @@ ERR << "Unknown type of atom" << endl; } // the patch should depends on its atoms, so we inject a requires on the just created atom resolvable - Capability cap( _f.parse(atom->kind(), atom->name(), Rel::EQ, atom->edition() )); - patch->injectRequires(cap); + // XXX + /*Capability cap( _f.parse(atom->kind(), atom->name(), Rel::EQ, atom->edition() )); + patch->injectRequires(cap);*/ } return patch; } @@ -1330,7 +1331,8 @@ CapFactory _f; Resolvable::Kind _kind = dep.kind == "" ? my_kind : Resolvable::Kind(dep.kind); Capability cap; - cap = _f.parse( _kind, dep.encoded ); + // XXX + // cap = _f.parse( _kind, dep.encoded ); return cap; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org