[yast-commit] r39323 - /branches/REFACTORING-10_3/pkg-bindings/src/Package.cc
Author: lslezak Date: Wed Jul 11 15:14:16 2007 New Revision: 39323 URL: http://svn.opensuse.org/viewcvs/yast?rev=39323&view=rev Log: - check baseUrlsBegin() validity in PkgMediaNames() Modified: branches/REFACTORING-10_3/pkg-bindings/src/Package.cc Modified: branches/REFACTORING-10_3/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/REFACTORING-10_3/pkg-bindings/src/Package.cc?rev=39323&r1=39322&r2=39323&view=diff ============================================================================== --- branches/REFACTORING-10_3/pkg-bindings/src/Package.cc (original) +++ branches/REFACTORING-10_3/pkg-bindings/src/Package.cc Wed Jul 11 15:14:16 2007 @@ -230,7 +230,21 @@ y2warning("Product for source '%d' not found", index); YCPList src_desc; - src_desc->add( YCPString( repoit->baseUrlsBegin()->asString()) ); + + // use URL as the product name + std::string name; + if (repoit->baseUrlsBegin() != repoit->baseUrlsEnd()) + { + name = repoit->baseUrlsBegin()->asString(); + } + + // use alias if url is unknown + if (name.empty()) + { + name = repoit->alias(); + } + + src_desc->add( YCPString( name )); src_desc->add( YCPInteger( index ) ); res->add( src_desc ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
lslezak@svn.opensuse.org