Author: dmacvicar Date: Tue Jul 31 16:31:43 2007 New Revision: 6336 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6336&view=rev Log: dont pass the filename in the repoinfo, it is private data, this fixes the breakage Modified: trunk/libzypp-testsuite/solver/src/deptestomatic.cc trunk/libzypp-testsuite/solver/src/helixparse.cc trunk/libzypp-testsuite/src/helix/HelixExtract.cc trunk/libzypp-testsuite/src/helix/HelixSourceImpl.cc trunk/libzypp-testsuite/src/helix/HelixSourceImpl.h Modified: trunk/libzypp-testsuite/solver/src/deptestomatic.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/src/deptestomatic.cc?rev=6336&r1=6335&r2=6336&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/src/deptestomatic.cc (original) +++ trunk/libzypp-testsuite/solver/src/deptestomatic.cc Tue Jul 31 16:31:43 2007 @@ -778,6 +778,7 @@ load_source (const string & alias, const string & filename, const string & type, bool system_packages) { Pathname pathname = globalPath + filename; + MIL << "'" << pathname << "'" << endl; int count = 0; Repository repo; @@ -819,8 +820,8 @@ .setEnabled ( true ) .setAutorefresh( false ) .addBaseUrl ( pathname.asUrl() ); - - zypp::repo::RepositoryImpl_Ptr impl( new HelixSourceImpl( nrepo ) ); + + zypp::repo::RepositoryImpl_Ptr impl( new HelixSourceImpl( pathname, nrepo ) ); repo = Repository( impl ); repo.resolvables(); Modified: trunk/libzypp-testsuite/solver/src/helixparse.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/src/helixparse.cc?rev=6336&r1=6335&r2=6336&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/src/helixparse.cc (original) +++ trunk/libzypp-testsuite/solver/src/helixparse.cc Tue Jul 31 16:31:43 2007 @@ -70,7 +70,7 @@ .setAutorefresh( false ) .addBaseUrl ( p.asUrl() ); - zypp::repo::RepositoryImpl_Ptr impl( new HelixSourceImpl( nrepo ) ); + zypp::repo::RepositoryImpl_Ptr impl( new HelixSourceImpl( p, nrepo ) ); repo = Repository( impl ); ResStore store = repo.resolvables(); Modified: trunk/libzypp-testsuite/src/helix/HelixExtract.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixExtract.cc?rev=6336&r1=6335&r2=6336&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixExtract.cc (original) +++ trunk/libzypp-testsuite/src/helix/HelixExtract.cc Tue Jul 31 16:31:43 2007 @@ -37,8 +37,6 @@ int extractHelixBuffer (const char *buf, size_t len, HelixSourceImpl *impl) { - ZYPP_THROW(Exception("I disabled this crap. dmacvicar")); - MIL << "extractHelixBuffer()" << endl; if (buf == NULL || len == 0) Modified: trunk/libzypp-testsuite/src/helix/HelixSourceImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixSourceImpl.cc?rev=6336&r1=6335&r2=6336&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixSourceImpl.cc (original) +++ trunk/libzypp-testsuite/src/helix/HelixSourceImpl.cc Tue Jul 31 16:31:43 2007 @@ -41,9 +41,9 @@ //--------------------------------------------------------------------------- -HelixSourceImpl::HelixSourceImpl(const RepoInfo &info) +HelixSourceImpl::HelixSourceImpl( const Pathname &file, const RepoInfo &info) : RepositoryImpl(info), - _pathname( info.baseUrlsBegin()->getPathName() ) + _pathname(file) {} HelixSourceImpl::~HelixSourceImpl() Modified: trunk/libzypp-testsuite/src/helix/HelixSourceImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixSourceImpl.h?rev=6336&r1=6335&r2=6336&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixSourceImpl.h (original) +++ trunk/libzypp-testsuite/src/helix/HelixSourceImpl.h Tue Jul 31 16:31:43 2007 @@ -52,7 +52,7 @@ public: /** Default ctor */ - HelixSourceImpl( const RepoInfo &info = RepoInfo() ); + HelixSourceImpl( const Pathname &file, const RepoInfo &info = RepoInfo() ); virtual ~HelixSourceImpl(); private: -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org