Hello community,
here is the log from the commit of package libzypp-zmd-backend
checked in at Thu Mar 30 10:28:13 CEST 2006.
--------
--- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-29 18:31:33.000000000 +0200
+++ libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-30 10:14:11.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Mar 30 10:13:24 CEST 2006 - kkaempf@suse.de
+
+- prepare for "query-pool" helper.
+- treat "@system" catalog as subscribed.
+- rev 2779
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp-zmd-backend.spec ++++++
--- /var/tmp/diff_new_pack.a9JRcB/_old 2006-03-30 10:28:02.000000000 +0200
+++ /var/tmp/diff_new_pack.a9JRcB/_new 2006-03-30 10:28:02.000000000 +0200
@@ -22,7 +22,7 @@
Obsoletes: zmd-librc-backend
Summary: ZMD backend for Package, Patch, Pattern, and Product Management
Version: 7.1.1
-Release: 22
+Release: 23
Source: zmd-backend-%{version}.tar.bz2
Prefix: /usr
@@ -68,6 +68,10 @@
/etc/logrotate.d/zmd-backend
%changelog -n libzypp-zmd-backend
+* Thu Mar 30 2006 - kkaempf@suse.de
+- prepare for "query-pool" helper.
+- treat "@system" catalog as subscribed.
+- rev 2779
* Wed Mar 29 2006 - kkaempf@suse.de
- always treat zmd sources as 'remote' (#160402)
- rev 2757
++++++ zmd-backend-7.1.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/Makefile.am new/zmd-backend-7.1.1/src/Makefile.am
--- old/zmd-backend-7.1.1/src/Makefile.am 2006-03-28 22:17:23.000000000 +0200
+++ new/zmd-backend-7.1.1/src/Makefile.am 2006-03-30 10:10:42.000000000 +0200
@@ -14,6 +14,7 @@
bindir = $(libdir)/zmd
bin_PROGRAMS = \
+ query-pool \
query-system \
query-files \
resolve-dependencies \
@@ -23,6 +24,7 @@
update-status \
transact
+query_pool_SOURCES = query-pool.cc zmd-backend.cc
query_system_SOURCES = query-system.cc zmd-backend.cc
query_files_SOURCES = query-files.cc zmd-backend.cc
resolve_dependencies_SOURCES = resolve-dependencies.cc transactions.cc transactions.h zmd-backend.cc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/Makefile.in new/zmd-backend-7.1.1/src/Makefile.in
--- old/zmd-backend-7.1.1/src/Makefile.in 2006-03-28 22:22:07.000000000 +0200
+++ new/zmd-backend-7.1.1/src/Makefile.in 2006-03-30 10:10:45.000000000 +0200
@@ -38,10 +38,10 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-bin_PROGRAMS = query-system$(EXEEXT) query-files$(EXEEXT) \
- resolve-dependencies$(EXEEXT) package-files$(EXEEXT) \
- parse-metadata$(EXEEXT) find-file$(EXEEXT) \
- update-status$(EXEEXT) transact$(EXEEXT)
+bin_PROGRAMS = query-pool$(EXEEXT) query-system$(EXEEXT) \
+ query-files$(EXEEXT) resolve-dependencies$(EXEEXT) \
+ package-files$(EXEEXT) parse-metadata$(EXEEXT) \
+ find-file$(EXEEXT) update-status$(EXEEXT) transact$(EXEEXT)
subdir = src
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
@@ -79,6 +79,11 @@
query_files_LDADD = $(LDADD)
query_files_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
$(am__DEPENDENCIES_2)
+am_query_pool_OBJECTS = query-pool.$(OBJEXT) zmd-backend.$(OBJEXT)
+query_pool_OBJECTS = $(am_query_pool_OBJECTS)
+query_pool_LDADD = $(LDADD)
+query_pool_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+ $(am__DEPENDENCIES_2)
am_query_system_OBJECTS = query-system.$(OBJEXT) zmd-backend.$(OBJEXT)
query_system_OBJECTS = $(am_query_system_OBJECTS)
query_system_LDADD = $(LDADD)
@@ -123,12 +128,14 @@
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(find_file_SOURCES) $(package_files_SOURCES) \
$(parse_metadata_SOURCES) $(query_files_SOURCES) \
- $(query_system_SOURCES) $(resolve_dependencies_SOURCES) \
- $(transact_SOURCES) $(update_status_SOURCES)
+ $(query_pool_SOURCES) $(query_system_SOURCES) \
+ $(resolve_dependencies_SOURCES) $(transact_SOURCES) \
+ $(update_status_SOURCES)
DIST_SOURCES = $(find_file_SOURCES) $(package_files_SOURCES) \
$(parse_metadata_SOURCES) $(query_files_SOURCES) \
- $(query_system_SOURCES) $(resolve_dependencies_SOURCES) \
- $(transact_SOURCES) $(update_status_SOURCES)
+ $(query_pool_SOURCES) $(query_system_SOURCES) \
+ $(resolve_dependencies_SOURCES) $(transact_SOURCES) \
+ $(update_status_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-exec-recursive install-info-recursive \
@@ -293,6 +300,7 @@
AM_CXXFLAGS = $(PKG_MANAGEMENT_CFLAGS) $(SQLITE_CFLAGS) $(ZYPP_CFLAGS)
LDADD = $(PKG_MANAGEMENT_LIBS) $(SQLITE_LIBS) $(ZYPP_LIBS)
noinst_HEADERS = zmd-backend.h
+query_pool_SOURCES = query-pool.cc zmd-backend.cc
query_system_SOURCES = query-system.cc zmd-backend.cc
query_files_SOURCES = query-files.cc zmd-backend.cc
resolve_dependencies_SOURCES = resolve-dependencies.cc transactions.cc transactions.h zmd-backend.cc
@@ -374,6 +382,9 @@
query-files$(EXEEXT): $(query_files_OBJECTS) $(query_files_DEPENDENCIES)
@rm -f query-files$(EXEEXT)
$(CXXLINK) $(query_files_LDFLAGS) $(query_files_OBJECTS) $(query_files_LDADD) $(LIBS)
+query-pool$(EXEEXT): $(query_pool_OBJECTS) $(query_pool_DEPENDENCIES)
+ @rm -f query-pool$(EXEEXT)
+ $(CXXLINK) $(query_pool_LDFLAGS) $(query_pool_OBJECTS) $(query_pool_LDADD) $(LIBS)
query-system$(EXEEXT): $(query_system_OBJECTS) $(query_system_DEPENDENCIES)
@rm -f query-system$(EXEEXT)
$(CXXLINK) $(query_system_LDFLAGS) $(query_system_OBJECTS) $(query_system_LDADD) $(LIBS)
@@ -397,6 +408,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/package-files.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-metadata.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/query-files.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/query-pool.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/query-system.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resolve-dependencies.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transact.Po@am__quote@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/dbsource/DbSources.cc new/zmd-backend-7.1.1/src/dbsource/DbSources.cc
--- old/zmd-backend-7.1.1/src/dbsource/DbSources.cc 2006-03-29 06:31:17.000000000 +0200
+++ new/zmd-backend-7.1.1/src/dbsource/DbSources.cc 2006-03-30 09:52:59.000000000 +0200
@@ -122,7 +122,9 @@
<< ", subs " << subscribed
<< endl;
- if (subscribed == 0) {
+ if (id != "@system"
+ && subscribed == 0)
+ {
MIL << "Not subscribed, skipping" << endl;
continue;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/query-pool.cc new/zmd-backend-7.1.1/src/query-pool.cc
--- old/zmd-backend-7.1.1/src/query-pool.cc 1970-01-01 01:00:00.000000000 +0100
+++ new/zmd-backend-7.1.1/src/query-pool.cc 2006-03-30 10:11:59.000000000 +0200
@@ -0,0 +1,156 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+#include <iostream>
+
+#include "zmd-backend.h"
+
+#include