Author: dmacvicar Date: Wed Apr 16 12:16:49 2008 New Revision: 9663 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9663&view=rev Log: add patch by aschnell. fix removing rpms with epoch (bnc #372323) version 2.31.3 Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/VERSION branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/target/rpm/RpmDb.cc Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/VERSION URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzypp/VERSION?rev=9663&r1=9662&r2=9663&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/VERSION Wed Apr 16 12:16:49 2008 @@ -49,5 +49,5 @@ m4_define([LIBZYPP_MINOR], [31]) m4_define([LIBZYPP_COMPATMINOR], [15]) dnl ================================================== -m4_define([LIBZYPP_PATCH], [2]) +m4_define([LIBZYPP_PATCH], [333]) dnl ================================================== Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes?rev=9663&r1=9662&r2=9663&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes Wed Apr 16 12:16:49 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 16 12:15:16 CEST 2008 - dmacvicar@suse.de + +- add patch by aschnell. fix removing rpms with epoch + (bnc #372323) +- version 2.31.3 + +------------------------------------------------------------------- Thu Apr 3 14:55:31 CEST 2008 - dmacvicar@suse.de - if a package is installOnly, then we dont care if a older Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/target/rpm/RpmDb.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/target/rpm/RpmDb.cc?rev=9663&r1=9662&r2=9663&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/target/rpm/RpmDb.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/target/rpm/RpmDb.cc Wed Apr 16 12:16:49 2008 @@ -1942,8 +1942,11 @@ // void RpmDb::removePackage( Package::constPtr package, unsigned flags ) { + // clear epoch, see bnc #372323 + Edition tmp(package->edition().version(), package->edition().release(), Edition::noepoch); + return removePackage( package->name() - + "-" + package->edition().asString() + + "-" + tmp.asString() + "." + package->arch().asString(), flags ); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org