1. Forum
  2. Usenet
  3. LINUX.DEBIAN.MAINT.DPKG

  • Bug#1006655: [PATCH] Implement rm_conffile_if_unmodified (5/5)

    From Josh Triplett@1:229/2 to All on Tue May 28 23:40:01 2024
    [continued from previous message]

    @@ -1 +1,2 @@
    /test-dir/test-conffile-to-be-removed +/test-dir/test-conffile-to-be-removed-if-unmodified
    diff --git a/tests/t-conffile-declarative-removal/pkg-conffile-v1/test-dir/test-conffile-to-be-removed-if-unmodified b/tests/t-conffile-declarative-removal/pkg-conffile-v1/test-dir/test-conffile-to-be-removed-if-unmodified
    new file mode 100644
    index 000000000..e69de29bb
    diff --git a/tests/t-conffile-declarative-removal/pkg-conffile-v2/DEBIAN/conffiles b/tests/t-conffile-declarative-removal/pkg-conffile-v2/DEBIAN/conffiles
    index 587753be1..58fee74b1 100644
    --- a/tests/t-conffile-declarative-removal/pkg-conffile-v2/DEBIAN/conffiles
    +++ b/tests/t-conffile-declarative-removal/pkg-conffile-v2/DEBIAN/conffiles
    @@ -1 +1,2 @@
    remove-on-upgrade /test-dir/test-conffile-to-be-removed
    +remove-if-unmodified /test-dir/test-conffile-to-be-removed-if-unmodified
    diff --git a/tests/t-conffile-obsolete/Makefile b/tests/t-conffile-obsolete/Makefile
    index 55d9477f5..3ed7d6267 100644
    --- a/tests/t-conffile-obsolete/Makefile
    +++ b/tests/t-conffile-obsolete/Makefile
    @@ -6,27 +6,39 @@ test-case:
    $(DPKG_INSTALL) pkg-conff-obsolete-0.deb
    $(DPKG_INSTALL) pkg-conff-obsolete-1.deb
    test -f '$(DPKG_INSTDIR)/test-conffile'
    + test -f '$(DPKG_INSTDIR)/test-conffile-2'
    $(DPKG_PURGE) pkg-conff-obsolete
    test ! -f '$(DPKG_INSTDIR)/test-conffile'
    + test ! -f '$(DPKG_INSTDIR)/test-conffile-2'
    # Unmodified conffile is autoremoved for the user
    $(DPKG_INSTALL) pkg-conff-obsolete-0.deb
    $(DPKG_UNPACK) pkg-conff-obsolete-2.deb
    test -f '$(DPKG_INSTDIR)/test-conffile.dp