Hello community, here is the log from the commit of package libzypp-zmd-backend checked in at Thu Apr 13 15:28:27 CEST 2006. -------- --- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-04-10 18:21:54.000000000 +0200 +++ STABLE/libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-04-12 17:28:10.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Apr 12 17:27:13 CEST 2006 - kkaempf@suse.de + +- write all atoms to support multi-arch patch deps (#165556) +- rev 3077 + +------------------------------------------------------------------- +Wed Apr 12 16:24:10 CEST 2006 - kkaempf@suse.de + +- create zypp source when added via zmd (#165103) +- rev 3072 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-zmd-backend.spec ++++++ --- /var/tmp/diff_new_pack.5CBMCP/_old 2006-04-13 15:26:57.000000000 +0200 +++ /var/tmp/diff_new_pack.5CBMCP/_new 2006-04-13 15:26:57.000000000 +0200 @@ -22,7 +22,7 @@ Obsoletes: zmd-librc-backend Summary: ZMD backend for Package, Patch, Pattern, and Product Management Version: 7.1.1.0 -Release: 7 +Release: 10 Source: zmd-backend-%{version}.tar.bz2 Prefix: /usr @@ -68,6 +68,12 @@ /etc/logrotate.d/zmd-backend %changelog -n libzypp-zmd-backend +* Wed Apr 12 2006 - kkaempf@suse.de +- write all atoms to support multi-arch patch deps (#165556) +- rev 3077 +* Wed Apr 12 2006 - kkaempf@suse.de +- create zypp source when added via zmd (#165103) +- rev 3072 * Mon Apr 10 2006 - kkaempf@suse.de - honor patch messages (#160015) - rev 3040 ++++++ zmd-backend-7.1.1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/dbsource/DbAccess.cc new/zmd-backend-7.1.1.0/src/dbsource/DbAccess.cc --- old/zmd-backend-7.1.1.0/src/dbsource/DbAccess.cc 2006-04-07 11:06:27.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/dbsource/DbAccess.cc 2006-04-12 17:25:46.000000000 +0200 @@ -983,7 +983,8 @@ if (obj->kind() != ResTraits<SrcPackage>::kind // don't write src/nosrc packages && ( status == ResStatus::installed // installed ones are ok - || obj->arch().compatibleWith( sysarch ) ) ) // and so are architecturally compatible ones + || obj->kind() == ResTraits<Atom>::kind // and atoms because we need them for multi-arch patch requirements + || obj->arch().compatibleWith( sysarch ) ) ) // and architecturally compatible ones { rowid = writeResObject( obj, status, catalog, force_remote ); if (rowid < 0) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/parse-metadata.cc new/zmd-backend-7.1.1.0/src/parse-metadata.cc --- old/zmd-backend-7.1.1.0/src/parse-metadata.cc 2006-04-10 16:10:51.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/parse-metadata.cc 2006-04-12 16:18:22.000000000 +0200 @@ -223,8 +223,32 @@ } } if (it == manager->Source_end()) { - WAR << "Source not found" << endl; - result = 1; + MIL << "Source not found, adding" << endl; + + Source_Ref source; + try { + source = SourceFactory().createFrom( uri, Pathname(), catalog, Pathname() ); + sync_source( db, source, catalog, Url() ); // zypp is always local + } + catch( const Exception & excpt_r ) { + cerr << "3|Can't add repository at " << uri << endl; + ZYPP_CAUGHT( excpt_r ); + ERR << "Can't add repository at " << uri << endl; + result = 1; + } + + if (result == 0) { + try { + manager->addSource( source ); + manager->store( "/", true /*metadata_cache*/ ); + } + catch (Exception & excpt_r) { + cerr << "3|Can't store zypp repository" << endl; + ZYPP_CAUGHT (excpt_r); + ERR << "Couldn't store sources" << endl; + result = 1; + } + } } } else if (type == YUM) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de