Author: dmacvicar Date: Wed Apr 2 15:47:29 2008 New Revision: 9342 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9342&view=rev Log: - Exclude delta and patch rpms from plaindir (bnc #368737) - version 2.31.0 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/source/plaindir/PlaindirImpl.cc branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/target/rpm/RpmHeader.cc branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/target/rpm/RpmHeader.h 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=9342&r1=9341&r2=9342&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/VERSION Wed Apr 2 15:47:29 2008 @@ -46,8 +46,8 @@ dnl ================================================== m4_define([LIBZYPP_MAJOR], [2]) dnl ================================================== -m4_define([LIBZYPP_MINOR], [30]) +m4_define([LIBZYPP_MINOR], [31]) m4_define([LIBZYPP_COMPATMINOR], [15]) dnl ================================================== -m4_define([LIBZYPP_PATCH], [10]) +m4_define([LIBZYPP_PATCH], [0]) 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=9342&r1=9341&r2=9342&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 2 15:47:29 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 2 15:45:48 CEST 2008 - dmacvicar@suse.de + +- Exclude delta and patch rpms from plaindir + (bnc #368737) +- version 2.31.0 + +------------------------------------------------------------------- Mon Mar 31 09:04:07 CEST 2008 - schubi@suse.de - Added new translations Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/source/plaindir/PlaindirImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/source/plaindir/PlaindirImpl.cc?rev=9342&r1=9341&r2=9342&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/source/plaindir/PlaindirImpl.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/source/plaindir/PlaindirImpl.cc Wed Apr 2 15:47:29 2008 @@ -107,12 +107,15 @@ } else if (file_info.isFile() && file_path.extension() == ".rpm" ) { RpmHeader::constPtr header = RpmHeader::readPackage( file_path, RpmHeader::NOSIGNATURE ); -#warning FIX creation of Package from src.rpm header - // make up proper location relative to rootpath (bnc #368218) - Package::Ptr package = target::rpm::RpmDb::makePackageFromHeader( header, NULL, subdir / *it, source ); - if (package != NULL) { - DBG << "Adding package " << *package << endl; - store.insert( package ); + + if ( ! ( header->isPatchRpm() || header->isDeltaRpm() ) ) + { + // make up proper location relative to rootpath (bnc #368218) + Package::Ptr package = target::rpm::RpmDb::makePackageFromHeader( header, NULL, subdir / *it, source ); + if (package != NULL) { + DBG << "Adding package " << *package << endl; + store.insert( package ); + } } } } Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/target/rpm/RpmHeader.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/target/rpm/RpmHeader.cc?rev=9342&r1=9341&r2=9342&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/target/rpm/RpmHeader.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/target/rpm/RpmHeader.cc Wed Apr 2 15:47:29 2008 @@ -149,6 +149,16 @@ return has_tag( RPMTAG_SOURCEPACKAGE ); } + bool RpmHeader::isPatchRpm() const + { + return stringList_val(RPMTAG_PATCHESNAME).size() > 0; + } + + bool RpmHeader::isDeltaRpm() const + { + return string_val( RPMTAG_PAYLOADFORMAT ) == "drpm"; + } + /////////////////////////////////////////////////////////////////// // // Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/target/rpm/RpmHeader.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/target/rpm/RpmHeader.h?rev=9342&r1=9341&r2=9342&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/target/rpm/RpmHeader.h (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/target/rpm/RpmHeader.h Wed Apr 2 15:47:29 2008 @@ -79,7 +79,18 @@ virtual ~RpmHeader(); + /** + * True if the rpm header is from a source rpm + */ bool isSrc() const; + /** + * True if the rpm header is from a patch rpm + */ + bool isPatchRpm() const; + /** + * True if the rpm header is from a delta rpm + */ + bool isDeltaRpm() const; public: -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org