Author: dmacvicar Date: Wed Jan 23 18:33:03 2008 New Revision: 8352 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8352&view=rev Log: by now the repomanager returns an invalid repo but loads the solv file in the global pool (should this be automatic?) Modified: branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc 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=8352&r1=8351&r2=8352&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc Wed Jan 23 18:33:03 2008 @@ -734,14 +734,8 @@ break; } -<<<<<<< HEAD:zypp/RepoManager.cc - -======= MIL << "repo type is " << repokind << endl; ->>>>>>> by now the repomanager returns an invalid repo -but loads the solv file in the global pool -(should this be automatic?):zypp/RepoManager.cc switch ( repokind.toEnum() ) { case RepoType::RPMMD_e : @@ -936,28 +930,15 @@ sat::Pool satpool( sat::Pool::instance() ); -<<<<<<< HEAD:zypp/RepoManager.cc - //Pathname name = _pimpl->options.repoCachePath + Pathname(info.alias()).extend(".solv"); - -======= Pathname solvfile = (_pimpl->options.repoCachePath + info.alias()).extend(".solv"); ->>>>>>> by now the repomanager returns an invalid repo -but loads the solv file in the global pool -(should this be automatic?):zypp/RepoManager.cc try { satpool.addRepoSolv(solvfile, info.alias()); } catch ( const Exception &e ) { -<<<<<<< HEAD:zypp/RepoManager.cc - -======= ZYPP_RETHROW(e); ->>>>>>> by now the repomanager returns an invalid repo -but loads the solv file in the global pool -(should this be automatic?):zypp/RepoManager.cc } CombinedProgressData subprogrcv(progress); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org