Author: dmacvicar Date: Thu Oct 16 19:23:12 2008 New Revision: 11380 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11380&view=rev Log: sadly, DirEntry type does not get filled for some remote protocols, therefore if we want to use find to search for a dir entry in a list, we need to relax operator == so it does not take in count type if it is not known. Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/PathInfo.cc trunk/libzypp/zypp/PathInfo.h Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=11380&r1=11379&r2=11380&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu Oct 16 19:23:12 2008 @@ -5,6 +5,12 @@ - revision 11377 ------------------------------------------------------------------- +Thu Oct 16 16:26:01 CEST 2008 - dmacvicar@suse.de + +- don't take into account stat information when looking + for remote SHA1SUMS (part of bnc#409927) + +------------------------------------------------------------------- Wed Oct 15 18:01:48 CEST 2008 - jkupec@suse.cz - MediaSetAccess::provideOptionalFile() added Modified: trunk/libzypp/zypp/PathInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PathInfo.cc?rev=11380&r1=11379&r2=11380&view=diff ============================================================================== --- trunk/libzypp/zypp/PathInfo.cc (original) +++ trunk/libzypp/zypp/PathInfo.cc Thu Oct 16 19:23:12 2008 @@ -598,6 +598,15 @@ // METHOD NAME : readdir // METHOD TYPE : int // + + bool DirEntry::operator==( const DirEntry &rhs ) const + { + // if one of the types is not known, use the name only + if ( type == FT_NOT_AVAIL || rhs.type == FT_NOT_AVAIL ) + return ( name == rhs.name ); + return ((name == rhs.name ) && (type == rhs.type)); + } + int readdir( DirContent & retlist, const Pathname & path, bool dots, PathInfo::Mode statmode ) { Modified: trunk/libzypp/zypp/PathInfo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PathInfo.h?rev=11380&r1=11379&r2=11380&view=diff ============================================================================== --- trunk/libzypp/zypp/PathInfo.h (original) +++ trunk/libzypp/zypp/PathInfo.h Thu Oct 16 19:23:12 2008 @@ -490,8 +490,7 @@ , type( type_r ) {} - bool operator==( const DirEntry &rhs ) const - { return ((name == rhs.name ) && (type == rhs.type)); } + bool operator==( const DirEntry &rhs ) const; }; /** Returned by readdir. */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org