Author: aschnell Date: Fri Oct 26 15:16:05 2007 New Revision: 7647 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7647&view=rev Log: - fixed retrieval of epoch from rpmdb (bug #246680) Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/parser/plaindir/RepoParser.cc trunk/libzypp/zypp/target/rpm/RpmDb.cc trunk/libzypp/zypp/target/rpm/RpmHeader.cc trunk/libzypp/zypp/target/rpm/RpmHeader.h Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=7647&r1=7646&r2=7647&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Fri Oct 26 15:16:05 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Oct 26 15:12:24 CEST 2007 - aschnell@suse.de + +- fixed retrieval of epoch from rpmdb (bug #246680) + +------------------------------------------------------------------- Thu Oct 25 16:29:24 CEST 2007 - aschnell@suse.de - allow non-existing "packages" file in susetags parser (bug Modified: trunk/libzypp/zypp/parser/plaindir/RepoParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/plaindir/RepoParser.cc?rev=7647&r1=7646&r2=7647&view=diff ============================================================================== --- trunk/libzypp/zypp/parser/plaindir/RepoParser.cc (original) +++ trunk/libzypp/zypp/parser/plaindir/RepoParser.cc Fri Oct 26 15:16:05 2007 @@ -94,7 +94,7 @@ catch (Exception & excpt_r) { ZYPP_CAUGHT( excpt_r ); WAR << "Package " << pkg->name << " has bad edition '" - << (header->tag_epoch().empty()?"":(header->tag_epoch()+":")) + << (header->tag_epoch()==0?"":(header->tag_epoch()+":")) << header->tag_version() << (header->tag_release().empty()?"":(string("-") + header->tag_release())) << "'"; return 0; Modified: trunk/libzypp/zypp/target/rpm/RpmDb.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/rpm/RpmDb.cc?rev=7647&r1=7646&r2=7647&view=diff ============================================================================== --- trunk/libzypp/zypp/target/rpm/RpmDb.cc (original) +++ trunk/libzypp/zypp/target/rpm/RpmDb.cc Fri Oct 26 15:16:05 2007 @@ -1188,7 +1188,7 @@ { ZYPP_CAUGHT( excpt_r ); WAR << "Package " << name << " has bad edition '" - << (header->tag_epoch().empty()?"":(header->tag_epoch()+":")) + << (header->tag_epoch()==0?"":(header->tag_epoch()+":")) << header->tag_version() << (header->tag_release().empty()?"":(string("-") + header->tag_release())) << "'"; return pptr; Modified: trunk/libzypp/zypp/target/rpm/RpmHeader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/rpm/RpmHeader.cc?rev=7647&r1=7646&r2=7647&view=diff ============================================================================== --- trunk/libzypp/zypp/target/rpm/RpmHeader.cc (original) +++ trunk/libzypp/zypp/target/rpm/RpmHeader.cc Fri Oct 26 15:16:05 2007 @@ -135,7 +135,7 @@ ostream & RpmHeader::dumpOn( ostream & str ) const { return BinHeader::dumpOn( str ) << '{' << tag_name() << "-" - << (tag_epoch().empty()?"":(tag_epoch()+":")) + << (tag_epoch()==0?"":(tag_epoch()+":")) << tag_version() << (tag_release().empty()?"":(string("-")+tag_release())) << ( isSrc() ? ".src}" : "}"); @@ -170,13 +170,13 @@ // // // METHOD NAME : RpmHeader::tag_epoch -// METHOD TYPE : string +// METHOD TYPE : int // // DESCRIPTION : // -string RpmHeader::tag_epoch() const +int RpmHeader::tag_epoch() const { - return string_val ( RPMTAG_EPOCH ); + return int_val ( RPMTAG_EPOCH ); } /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/target/rpm/RpmHeader.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/rpm/RpmHeader.h?rev=7647&r1=7646&r2=7647&view=diff ============================================================================== --- trunk/libzypp/zypp/target/rpm/RpmHeader.h (original) +++ trunk/libzypp/zypp/target/rpm/RpmHeader.h Fri Oct 26 15:16:05 2007 @@ -92,7 +92,7 @@ public: std::string tag_name() const; - std::string tag_epoch() const; + int tag_epoch() const; std::string tag_version() const; std::string tag_release() const; std::string tag_arch() const; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org