Author: aschnell Date: Thu Oct 4 12:03:45 2007 New Revision: 7435 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7435&view=rev Log: - only look for repositories in file ending ".repo" (bug #294779) Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/RepoManager.cc Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=7435&r1=7434&r2=7435&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu Oct 4 12:03:45 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Oct 04 11:23:19 CEST 2007 - aschnell@suse.de + +- only look for repositories in file ending ".repo" (bug #294779) + +------------------------------------------------------------------- Wed Oct 3 13:37:57 CEST 2007 - mvidner@suse.cz - Fixed compilation errors with GCC 4.3 by adding missing includes Modified: trunk/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.cc?rev=7435&r1=7434&r2=7435&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoManager.cc (original) +++ trunk/libzypp/zypp/RepoManager.cc Thu Oct 4 12:03:45 2007 @@ -162,7 +162,7 @@ /** * \short List of RepoInfo's from a directory * - * Goes trough every file in a directory and adds all + * Goes trough every file ending with ".repo" in a directory and adds all * RepoInfo's contained in that file. * * \param dir pathname of the directory to read. @@ -177,11 +177,14 @@ for ( list<Pathname>::const_iterator it = entries.begin(); it != entries.end(); ++it ) { - list<RepoInfo> tmp = repositories_in_file( *it ); - repos.insert( repos.end(), tmp.begin(), tmp.end() ); + if (it->extension() == ".repo") + { + list<RepoInfo> tmp = repositories_in_file( *it ); + repos.insert( repos.end(), tmp.begin(), tmp.end() ); - //std::copy( collector.repos.begin(), collector.repos.end(), std::back_inserter(repos)); - //MIL << "ok" << endl; + //std::copy( collector.repos.begin(), collector.repos.end(), std::back_inserter(repos)); + //MIL << "ok" << endl; + } } return repos; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org