Author: jkupec Date: Fri Jul 27 16:40:22 2007 New Revision: 6259 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6259&view=rev Log: - ignore empty url keys (baseurl, mirrorlist, gpgkey) instead of throwing bad url exception Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/parser/RepoFileReader.cc Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=6259&r1=6258&r2=6259&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Fri Jul 27 16:40:22 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jul 27 16:31:38 CEST 2007 - jkupec@suse.cz + +- RepoFileReader - ignore empty url keys (baseurl, mirrorlist, + gpgkey) instead of throwing bad url exception +- revision 6257 + +------------------------------------------------------------------- Thu Jul 26 16:41:30 CEST 2007 - kkaempf@suse.de - Make clearing of extra dependencies/conflicts configurable when Modified: trunk/libzypp/zypp/parser/RepoFileReader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/RepoFileReader.cc?rev=6259&r1=6258&r2=6259&view=diff ============================================================================== --- trunk/libzypp/zypp/parser/RepoFileReader.cc (original) +++ trunk/libzypp/zypp/parser/RepoFileReader.cc Fri Jul 27 16:40:22 2007 @@ -50,13 +50,12 @@ it != dict.entriesEnd(*its); ++it ) { - //MIL << (*it).first << endl; if (it->first == "name" ) info.setName(it-> second); else if ( it->first == "enabled" ) info.setEnabled( it->second == "1" ); - else if ( it->first == "baseurl" ) + else if ( it->first == "baseurl" && !it->second.empty()) info.addBaseUrl( Url(it->second) ); else if ( it->first == "path" ) info.setPath( Pathname(it->second) ); @@ -64,9 +63,9 @@ info.setType(repo::RepoType(it->second)); else if ( it->first == "autorefresh" ) info.setAutorefresh( it->second == "1" ); - else if ( it->first == "mirrorlist" ) + else if ( it->first == "mirrorlist" && !it->second.empty()) info.setMirrorListUrl(Url(it->second)); - else if ( it->first == "gpgkey" ) + else if ( it->first == "gpgkey" && !it->second.empty()) info.setGpgKeyUrl( Url(it->second) ); else if ( it->first == "gpgcheck" ) info.setGpgCheck( it->second == "1" ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org