[RFC/PATCH 0/7] conffiledb revisited
Hi,
Here is the result of a blind rebase of the conffiledb patches sent a
while ago, rebased against dpkg master. Untested. I'll include a few
thoughts with each message. Probably I have terribly mutilated the
patches; please feel free to let me know of any infelicities and I'll
be glad to incorporate them in an improved series.
Sean Finney (7):
Split some useful functions from help.c to (new) util.c
Conffile database handling functions
Include the conffiledb directory in the dpkg deb package
Hook conffile database into dpkg unpack/configure/remove stages
Implement 'p' option for diffing dist conffiles during conflict
resolution
Implement 'm' option for conffile merging during conflict resolution
Track common ancestors of a successful conffiledb merge
debian/dpkg.dirs | 1 +
lib/dpkg/dpkg.h | 2 +
lib/dpkg/test/Makefile.am | 3 +-
lib/dpkg/test/t-conffiledb.c | 396 ++++++++++++++++++++++++++++++++++++++
src/Makefile.am | 4 +-
src/archives.c | 15 ++-
src/conffiledb.c | 429 ++++++++++++++++++++++++++++++++++++++++++
src/conffiledb.h | 84 ++++++++
src/configure.c | 41 ++++-
src/help.c | 61 ------
src/remove.c | 5 +
src/util.c | 127 +++++++++++++
12 files changed, 1102 insertions(+), 66 deletions(-)
create mode 100644 debian/dpkg.dirs
create mode 100644 lib/dpkg/test/t-conffiledb.c
create mode 100644 src/conffiledb.c
create mode 100644 src/conffiledb.h
create mode 100644 src/util.c
Reply to: