Author: jkupec Date: Tue Jun 12 15:29:27 2007 New Revision: 5734 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5734&view=rev Log: fixed reading unversioned capabilities Modified: trunk/libzypp/zypp/parser/yum/FileReaderBaseImpl.cc Modified: trunk/libzypp/zypp/parser/yum/FileReaderBaseImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/yum/FileReaderBaseImpl.cc?rev=5734&r1=5733&r2=5734&view=diff ============================================================================== --- trunk/libzypp/zypp/parser/yum/FileReaderBaseImpl.cc (original) +++ trunk/libzypp/zypp/parser/yum/FileReaderBaseImpl.cc Tue Jun 12 15:29:27 2007 @@ -305,12 +305,6 @@ if (!_expect_rpm_entry) ZYPP_THROW(ParseException("rpm:entry found when not expected")); - Edition edition( - reader_r->getAttribute("ver").asString(), - reader_r->getAttribute("rel").asString(), - reader_r->getAttribute("epoch").asString() - ); - // read kind of resolvable this entry refers, default to Package string kind_str = reader_r->getAttribute("kind").asString(); Resolvable::Kind kind; @@ -335,15 +329,36 @@ << reader_r->getAttribute("name").asString() << " " << edition << " (" << kind << ")" << endl; */ - // insert the dependency into the list - deps_r[pre ? Dep::PREREQUIRES : _dtype].insert( - zypp::capability::parse( - kind, - reader_r->getAttribute("name").asString(), - Rel(reader_r->getAttribute("flags").asString()), - edition - ) - ); + + string version = reader_r->getAttribute("ver").asString(); + + if (version.empty()) + { + // insert unversion dependency into the list + deps_r[pre ? Dep::PREREQUIRES : _dtype].insert( + zypp::capability::parse( + kind, reader_r->getAttribute("name").asString() + ) + ); + } + else + { + Edition edition( + version, + reader_r->getAttribute("rel").asString(), + reader_r->getAttribute("epoch").asString() + ); + + // insert versioned dependency into the list + deps_r[pre ? Dep::PREREQUIRES : _dtype].insert( + zypp::capability::parse( + kind, + reader_r->getAttribute("name").asString(), + Rel(reader_r->getAttribute("flags").asString()), + edition + ) + ); + } //! \todo check } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org