Mailinglist Archive: opensuse-commit (1028 mails)
| < Previous | Next > |
commit libzypp-zmd-backend
- From: root@xxxxxxx (h_root)
- Date: Thu, 8 Jun 2006 15:12:13 +0200 (CEST)
- Message-id: <20060608131213.226A71AB9A@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package libzypp-zmd-backend
checked in at Thu Jun 8 15:12:13 CEST 2006.
--------
--- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-06-06 13:42:25.000000000 +0200
+++ libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-06-08 12:54:51.000000000 +0200
@@ -1,0 +2,18 @@
+Thu Jun 8 12:53:53 CEST 2006 - kkaempf@xxxxxxx
+
+- fix logrotate config (#182457)
+- rev 3544
+
+-------------------------------------------------------------------
+Wed Jun 7 16:43:23 CEST 2006 - kkaempf@xxxxxxx
+
+- set proper exit code if source creation fails (#182222)
+- rev 3539
+
+-------------------------------------------------------------------
+Wed Jun 7 16:14:37 CEST 2006 - kkaempf@xxxxxxx
+
+- treat remote, yum type sources as ZMD owned. (#176964)
+- rev 3538
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp-zmd-backend.spec ++++++
--- /var/tmp/diff_new_pack.b147lE/_old 2006-06-08 15:11:37.000000000 +0200
+++ /var/tmp/diff_new_pack.b147lE/_new 2006-06-08 15:11:37.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: 53
+Release: 54
Source: zmd-backend-%{version}.tar.bz2
Prefix: /usr
@@ -68,6 +68,15 @@
/etc/logrotate.d/zmd-backend
%changelog -n libzypp-zmd-backend
+* Thu Jun 08 2006 - kkaempf@xxxxxxx
+- fix logrotate config (#182457)
+- rev 3544
+* Wed Jun 07 2006 - kkaempf@xxxxxxx
+- set proper exit code if source creation fails (#182222)
+- rev 3539
+* Wed Jun 07 2006 - kkaempf@xxxxxxx
+- treat remote, yum type sources as ZMD owned. (#176964)
+- rev 3538
* Tue Jun 06 2006 - kkaempf@xxxxxxx
- empty catalog before filling (#181602)
- rev 3510
++++++ 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/logrotate_zmd_backend new/zmd-backend-7.1.1.0/logrotate_zmd_backend
--- old/zmd-backend-7.1.1.0/logrotate_zmd_backend 2006-05-12 12:13:26.000000000 +0200
+++ new/zmd-backend-7.1.1.0/logrotate_zmd_backend 2006-06-08 12:51:49.000000000 +0200
@@ -1,9 +1,9 @@
/var/log/zmd-backend.log {
compress
dateext
- maxage 365
- rotate 9
- size=+1024k
+ daily
+ rotate 7
+ size 1M
notifempty
missingok
copytruncate
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/dbsource/DbPackageImpl.cc new/zmd-backend-7.1.1.0/src/dbsource/DbPackageImpl.cc
--- old/zmd-backend-7.1.1.0/src/dbsource/DbPackageImpl.cc 2006-05-17 10:03:18.000000000 +0200
+++ new/zmd-backend-7.1.1.0/src/dbsource/DbPackageImpl.cc 2006-06-07 15:48:17.000000000 +0200
@@ -69,7 +69,7 @@
if (text != NULL
&& *text != 0)
{
- _location = Pathname( text ); // if set, use this (zmd owned source)
+ _location = Pathname( text ); // if set, use this (zmd owned or local source)
}
else {
text = (const char *)sqlite3_column_text( handle, 14 ); // else use package_url
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/dbsource/DbSources.cc new/zmd-backend-7.1.1.0/src/dbsource/DbSources.cc
--- old/zmd-backend-7.1.1.0/src/dbsource/DbSources.cc 2006-05-30 12:12:05.000000000 +0200
+++ new/zmd-backend-7.1.1.0/src/dbsource/DbSources.cc 2006-06-07 16:12:22.000000000 +0200
@@ -137,7 +137,16 @@
return _sources;
}
+
+ // assume all sources in sqlite are 'local' (resp. ZMD owned)
+ // as ZMD does the download of packages to a local cache dir,
+ // libzypp never downloads itself but assumes all packages are local
+ // hence we set the base Url to "file:/" and attach package_filename
+ // (attribute of package_details table) later, giving a complete,
+ // local Url. See #176964
media::MediaId mediaid = mmgr.open( Url( "file:/" ) );
+
+
SourceFactory factory;
// read catalogs table
@@ -172,6 +181,9 @@
if (alias.empty()) alias = name;
if (desc.empty()) desc = alias;
+ // try to find a matching YaST source. This is needed for non-YUM type
+ // repositories, e.g. CD, DVD or local mounts (nfs, smb, ...)
+
Source_Ref zypp_source;
if (zypp_restore
@@ -203,9 +215,18 @@
}
}
- if (zypp_source) {
- zypp_source.setId( id ); // set id, to match resolvable catalog
- MIL << "Found " << zypp_source << endl;
+
+ // If the source exists in YaST and is not type "YUM", rewrite the mediaid to the
+ // real Url (e.g. "cd://", "nfs://....", etc.)
+ // However, a non-remote YUM source (e.g. a nfs-mounted repodata/) must be handled
+ // by zypp. cf. #176964
+
+ if (zypp_source
+ && ((zypp_source.type() != "YUM") // only treat (remote and yum) sources as ZMD owned
+ || !zypp_source.remote())) // -> treat (!remote or !yum) sources as zypp owned
+ {
+ zypp_source.setId( id ); // set id, to match resolvable catalog -> change "file:/" to actual Url
+ MIL << "Found " << zypp_source << endl; // -> treat as zypp owned !
}
}
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-06-02 15:26:58.000000000 +0200
+++ new/zmd-backend-7.1.1.0/src/parse-metadata.cc 2006-06-07 16:42:43.000000000 +0200
@@ -293,6 +293,7 @@
cerr << "3|Can't add repository at " << uri << ": " << excpt_r.asUserString() << endl;
ZYPP_CAUGHT( excpt_r );
ERR << "Can't add repository at " << uri << endl;
+ result = 1;
goto finish;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit-help@xxxxxxxxxxxx
| < Previous | Next > |