This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
commit 542885e824d005bc9a8a92e341f71fb323437b90 Author: Guillem Jover <[email protected]> Date: Thu Apr 5 04:58:20 2018 +0200 libdpkg: Move control database code into db-ctrl modules This continues the work to generalize and make these interfaces available to other users beside dpkg itself. --- lib/dpkg/Makefile.am | 4 ++++ src/infodb-access.c => lib/dpkg/db-ctrl-access.c | 5 ++--- src/infodb-format.c => lib/dpkg/db-ctrl-format.c | 3 +-- src/infodb-upgrade.c => lib/dpkg/db-ctrl-upgrade.c | 5 ++--- src/infodb.h => lib/dpkg/db-ctrl.h | 10 +++++----- po/POTFILES.in | 3 +++ src/Makefile.am | 9 +-------- src/archives.c | 2 +- src/depcon.c | 2 +- src/enquiry.c | 2 +- src/filesdb-hash.c | 2 +- src/filesdb.c | 2 +- src/packages.c | 2 +- src/querycmd.c | 2 +- src/remove.c | 2 +- src/script.c | 2 +- src/select.c | 2 +- src/trigproc.c | 2 +- src/unpack.c | 2 +- src/verify.c | 2 +- 20 files changed, 31 insertions(+), 34 deletions(-) diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am index 65dd581..22cef82 100644 --- a/lib/dpkg/Makefile.am +++ b/lib/dpkg/Makefile.am @@ -53,6 +53,9 @@ libdpkg_la_SOURCES = \ compress.c \ dbdir.c \ dbmodify.c \ + db-ctrl-access.c \ + db-ctrl-format.c \ + db-ctrl-upgrade.c \ deb-version.c \ debug.c \ depcon.c \ @@ -114,6 +117,7 @@ pkginclude_HEADERS = \ color.h \ command.h \ compress.h \ + db-ctrl.h \ deb-version.h \ debug.h \ dir.h \ diff --git a/src/infodb-access.c b/lib/dpkg/db-ctrl-access.c similarity index 98% rename from src/infodb-access.c rename to lib/dpkg/db-ctrl-access.c index c28f46d..1c1dc19 100644 --- a/src/infodb-access.c +++ b/lib/dpkg/db-ctrl-access.c @@ -32,11 +32,10 @@ #include <dpkg/i18n.h> #include <dpkg/dpkg.h> #include <dpkg/dpkg-db.h> +#include <dpkg/fsys.h> +#include <dpkg/db-ctrl.h> #include <dpkg/debug.h> -#include "filesdb.h" -#include "infodb.h" - bool pkg_infodb_has_file(struct pkginfo *pkg, struct pkgbin *pkgbin, const char *name) diff --git a/src/infodb-format.c b/lib/dpkg/db-ctrl-format.c similarity index 99% rename from src/infodb-format.c rename to lib/dpkg/db-ctrl-format.c index 4329308..f124ada 100644 --- a/src/infodb-format.c +++ b/lib/dpkg/db-ctrl-format.c @@ -32,8 +32,7 @@ #include <dpkg/dpkg.h> #include <dpkg/dpkg-db.h> #include <dpkg/varbuf.h> - -#include "infodb.h" +#include <dpkg/db-ctrl.h> static enum pkg_infodb_format db_format = PKG_INFODB_FORMAT_UNKNOWN; static bool db_upgrading; diff --git a/src/infodb-upgrade.c b/lib/dpkg/db-ctrl-upgrade.c similarity index 99% rename from src/infodb-upgrade.c rename to lib/dpkg/db-ctrl-upgrade.c index 1a8e144..67c4ce0 100644 --- a/src/infodb-upgrade.c +++ b/lib/dpkg/db-ctrl-upgrade.c @@ -34,12 +34,11 @@ #include <dpkg/i18n.h> #include <dpkg/dpkg.h> #include <dpkg/dpkg-db.h> +#include <dpkg/fsys.h> +#include <dpkg/db-ctrl.h> #include <dpkg/path.h> #include <dpkg/dir.h> -#include "filesdb.h" -#include "infodb.h" - struct rename_node { struct rename_node *next; char *old; diff --git a/src/infodb.h b/lib/dpkg/db-ctrl.h similarity index 89% rename from src/infodb.h rename to lib/dpkg/db-ctrl.h index 472011c..93bed39 100644 --- a/src/infodb.h +++ b/lib/dpkg/db-ctrl.h @@ -1,6 +1,6 @@ /* - * dpkg - main program for package management - * infodb.h - package control information database + * libdpkg - Debian packaging suite library routines + * db-ctrl.h - package control information database * * Copyright © 2011-2014 Guillem Jover <[email protected]> * @@ -18,8 +18,8 @@ * along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#ifndef DPKG_INFODB_H -#define DPKG_INFODB_H +#ifndef LIBDPKG_DB_CTRL_H +#define LIBDPKG_DB_CTRL_H #include <stdbool.h> @@ -48,4 +48,4 @@ typedef void pkg_infodb_file_func(const char *filename, const char *filetype); void pkg_infodb_foreach(struct pkginfo *pkg, struct pkgbin *pkgbin, pkg_infodb_file_func *func); -#endif /* DPKG_INFODB_H */ +#endif /* LIBDPKG_DB_CTRL_H */ diff --git a/po/POTFILES.in b/po/POTFILES.in index e4c3815..d7fb817 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -11,6 +11,9 @@ lib/dpkg/command.c lib/dpkg/compress.c lib/dpkg/dbdir.c lib/dpkg/dbmodify.c +lib/dpkg/db-ctrl-access.c +lib/dpkg/db-ctrl-format.c +lib/dpkg/db-ctrl-update.c lib/dpkg/deb-version.c lib/dpkg/debug.c lib/dpkg/depcon.c diff --git a/src/Makefile.am b/src/Makefile.am index 2d776dd..1e9735a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,7 +27,7 @@ bin_PROGRAMS = \ noinst_HEADERS = \ filesdb.h \ - infodb.h + $(nil) dpkg_SOURCES = \ archives.c archives.h \ @@ -40,9 +40,6 @@ dpkg_SOURCES = \ filesdb-hash.c \ file-match.c file-match.h \ filters.c filters.h \ - infodb-access.c \ - infodb-format.c \ - infodb-upgrade.c \ divertdb.c \ statdb.c \ help.c \ @@ -64,20 +61,16 @@ dpkg_LDADD = \ dpkg_divert_SOURCES = \ filesdb.c \ - infodb-format.c \ divertdb.c \ divertcmd.c dpkg_query_SOURCES = \ filesdb.c \ - infodb-access.c \ - infodb-format.c \ divertdb.c \ querycmd.c dpkg_statoverride_SOURCES = \ filesdb.c \ - infodb-format.c \ selinux.c \ statdb.c \ statcmd.c diff --git a/src/archives.c b/src/archives.c index 113b76c..6d73375 100644 --- a/src/archives.c +++ b/src/archives.c @@ -55,12 +55,12 @@ #include <dpkg/tarfn.h> #include <dpkg/options.h> #include <dpkg/triglib.h> +#include <dpkg/db-ctrl.h> #include "filesdb.h" #include "main.h" #include "archives.h" #include "filters.h" -#include "infodb.h" static inline void fd_writeback_init(int fd) diff --git a/src/depcon.c b/src/depcon.c index 398d06a..560190c 100644 --- a/src/depcon.c +++ b/src/depcon.c @@ -34,9 +34,9 @@ #include <dpkg/i18n.h> #include <dpkg/dpkg.h> #include <dpkg/dpkg-db.h> +#include <dpkg/db-ctrl.h> #include "filesdb.h" -#include "infodb.h" #include "main.h" struct deppossi_pkg_iterator { diff --git a/src/enquiry.c b/src/enquiry.c index 99349ba..6182fce 100644 --- a/src/enquiry.c +++ b/src/enquiry.c @@ -42,9 +42,9 @@ #include <dpkg/triglib.h> #include <dpkg/string.h> #include <dpkg/options.h> +#include <dpkg/db-ctrl.h> #include "filesdb.h" -#include "infodb.h" #include "main.h" struct audit_problem { diff --git a/src/filesdb-hash.c b/src/filesdb-hash.c index 2757160..c04d7a8 100644 --- a/src/filesdb-hash.c +++ b/src/filesdb-hash.c @@ -35,9 +35,9 @@ #include <dpkg/debug.h> #include <dpkg/fdio.h> #include <dpkg/dir.h> +#include <dpkg/db-ctrl.h> #include "filesdb.h" -#include "infodb.h" /* * If mask is nonzero, will not write any file whose filenamenode diff --git a/src/filesdb.c b/src/filesdb.c index 87bca58..8ca613e 100644 --- a/src/filesdb.c +++ b/src/filesdb.c @@ -49,9 +49,9 @@ #include <dpkg/fdio.h> #include <dpkg/pkg-array.h> #include <dpkg/progress.h> +#include <dpkg/db-ctrl.h> #include "filesdb.h" -#include "infodb.h" #include "main.h" /*** Generic data structures and routines. ***/ diff --git a/src/packages.c b/src/packages.c index ae00175..da221c0 100644 --- a/src/packages.c +++ b/src/packages.c @@ -41,9 +41,9 @@ #include <dpkg/pkg-queue.h> #include <dpkg/string.h> #include <dpkg/options.h> +#include <dpkg/db-ctrl.h> #include "filesdb.h" -#include "infodb.h" #include "main.h" static struct pkginfo *progress_bytrigproc; diff --git a/src/querycmd.c b/src/querycmd.c index 127f0c8..67b84b2 100644 --- a/src/querycmd.c +++ b/src/querycmd.c @@ -54,9 +54,9 @@ #include <dpkg/path.h> #include <dpkg/file.h> #include <dpkg/options.h> +#include <dpkg/db-ctrl.h> #include "filesdb.h" -#include "infodb.h" #include "main.h" static const char *showformat = "${binary:Package}\t${Version}\n"; diff --git a/src/remove.c b/src/remove.c index 9cfd7d0..45c9a9e 100644 --- a/src/remove.c +++ b/src/remove.c @@ -42,8 +42,8 @@ #include <dpkg/dir.h> #include <dpkg/options.h> #include <dpkg/triglib.h> +#include <dpkg/db-ctrl.h> -#include "infodb.h" #include "filesdb.h" #include "main.h" diff --git a/src/script.c b/src/script.c index ecf4a94..bb5f982 100644 --- a/src/script.c +++ b/src/script.c @@ -42,9 +42,9 @@ #include <dpkg/subproc.h> #include <dpkg/command.h> #include <dpkg/triglib.h> +#include <dpkg/db-ctrl.h> #include "filesdb.h" -#include "infodb.h" #include "main.h" void diff --git a/src/select.c b/src/select.c index 6faf67d..ebdb13b 100644 --- a/src/select.c +++ b/src/select.c @@ -37,9 +37,9 @@ #include <dpkg/pkg-show.h> #include <dpkg/pkg-spec.h> #include <dpkg/options.h> +#include <dpkg/db-ctrl.h> #include "filesdb.h" -#include "infodb.h" #include "main.h" static void getsel1package(struct pkginfo *pkg) { diff --git a/src/trigproc.c b/src/trigproc.c index 7b6537b..70a42ea 100644 --- a/src/trigproc.c +++ b/src/trigproc.c @@ -33,11 +33,11 @@ #include <dpkg/dpkg-db.h> #include <dpkg/pkg.h> #include <dpkg/pkg-queue.h> +#include <dpkg/db-ctrl.h> #include <dpkg/triglib.h> #include "main.h" #include "filesdb.h" -#include "infodb.h" /* * Trigger processing algorithms: diff --git a/src/unpack.c b/src/unpack.c index f43c01e..ae0e121 100644 --- a/src/unpack.c +++ b/src/unpack.c @@ -51,11 +51,11 @@ #include <dpkg/dir.h> #include <dpkg/tarfn.h> #include <dpkg/options.h> +#include <dpkg/db-ctrl.h> #include <dpkg/triglib.h> #include "filesdb.h" #include "file-match.h" -#include "infodb.h" #include "main.h" #include "archives.h" diff --git a/src/verify.c b/src/verify.c index e68ec7b..2698fc2 100644 --- a/src/verify.c +++ b/src/verify.c @@ -29,9 +29,9 @@ #include <dpkg/dpkg.h> #include <dpkg/dpkg-db.h> #include <dpkg/options.h> +#include <dpkg/db-ctrl.h> #include "filesdb.h" -#include "infodb.h" #include "main.h" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/dpkg/dpkg.git
