[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH 0/6] patch series for review: conffile database + merging



the following series of patches is a renewed attempt at conffile tracking,
where the packaged conffiles are stored in a seperate location on the
system in their pristine forms.  the patches the follow contain more
information on the details.

the first 3 patches are required changes in dpkg, mostly changing the
interface of internal static functions and renaming/exposing other static 
functions that are needed for the features in the patches that follow.

Sean Finney (6):
  move quote_filename into lib/dpkg/path.{c,h} as path_quote_filename
  move copyfileperms to non-static file_copyfileperms
  update promptconfaction() to also require package name
  conffile-database handling functions
  hook conffile database into dpkg unpack/configure/remove stages
  implement 'm' option for conffile merging during conflict resolution

 lib/dpkg/Makefile.am |    1 +
 lib/dpkg/dpkg.h      |    3 +
 lib/dpkg/file.c      |   59 +++++++++++++
 lib/dpkg/file.h      |   35 ++++++++
 lib/dpkg/path.c      |   59 +++++++++++++
 lib/dpkg/path.h      |    1 +
 src/Makefile.am      |    1 +
 src/archives.c       |   77 +++-------------
 src/conffiles.c      |  236 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/conffiles.h      |   55 ++++++++++++
 src/configure.c      |   55 +++++-------
 src/processarc.c     |    4 +
 src/remove.c         |    3 +
 13 files changed, 496 insertions(+), 93 deletions(-)
 create mode 100644 lib/dpkg/file.c
 create mode 100644 lib/dpkg/file.h
 create mode 100644 src/conffiles.c
 create mode 100644 src/conffiles.h


Reply to: