This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=9445ed7ce79e697ade95d1bddb68b30f54bdb6be commit 9445ed7ce79e697ade95d1bddb68b30f54bdb6be Author: Guillem Jover <[email protected]> AuthorDate: Tue Aug 19 10:12:39 2014 +0200 Add test cases for switching directories from and to relative symlink targets --- Makefile | 6 +- .../Makefile | 0 .../pkg-dir-conffile-0/DEBIAN/conffiles | 0 .../pkg-dir-conffile-0/DEBIAN/control | 0 .../pkg-dir-conffile-0/test-path/file-conf | 0 .../pkg-dir-conffile-1/DEBIAN/control | 0 .../pkg-dir-conffile-1/DEBIAN/postinst | 0 .../pkg-dir-conffile-1/DEBIAN/postrm | 0 .../pkg-dir-conffile-1/DEBIAN/preinst | 0 .../pkg-dir-conffile-1/test-path | 0 .../pkg-dir-file-moved/DEBIAN/control | 0 .../pkg-dir-file-moved/test-dir/file-normal | 0 .../pkg-dir-file-other/DEBIAN/control | 0 .../pkg-dir-file-other/test-path/file-other | 0 .../pkg-dir-symlink-ext-0/DEBIAN/control | 0 .../pkg-dir-symlink-ext-0/test-path/file-normal | 0 .../pkg-dir-symlink-ext-1/DEBIAN/control | 0 .../pkg-dir-symlink-ext-1/DEBIAN/postinst | 0 .../pkg-dir-symlink-ext-1/DEBIAN/postrm | 0 .../pkg-dir-symlink-ext-1/DEBIAN/preinst | 0 .../pkg-dir-symlink-ext-1/test-path | 0 .../pkg-dir-symlink-int-0/DEBIAN/control | 0 .../pkg-dir-symlink-int-0/test-path/file-normal | 0 .../pkg-dir-symlink-int-1/DEBIAN/control | 0 .../pkg-dir-symlink-int-1/DEBIAN/postinst | 0 .../pkg-dir-symlink-int-1/DEBIAN/postrm | 0 .../pkg-dir-symlink-int-1/DEBIAN/preinst | 0 .../pkg-dir-symlink-int-1/test-dir/file-other | 0 .../pkg-dir-symlink-int-1/test-path | 0 .../Makefile | 90 +++++++++++----------- .../pkg-dir-conffile-0/DEBIAN/conffiles | 1 + .../pkg-dir-conffile-0/DEBIAN/control | 0 .../test-path/test-subpath}/file-conf | 0 .../pkg-dir-conffile-1/DEBIAN/control | 0 .../pkg-dir-conffile-1/DEBIAN/postinst | 6 ++ .../pkg-dir-conffile-1/DEBIAN/postrm | 6 ++ .../pkg-dir-conffile-1/DEBIAN/preinst | 6 ++ .../pkg-dir-conffile-1/test-path/test-subpath | 1 + .../pkg-dir-file-moved/DEBIAN/control | 0 .../pkg-dir-file-moved/test-dir/file-normal | 0 .../pkg-dir-file-other/DEBIAN/control | 0 .../test-path/test-subpath}/file-other | 0 .../pkg-dir-symlink-ext-0/DEBIAN/control | 0 .../test-path/test-subpath}/file-normal | 0 .../pkg-dir-symlink-ext-1/DEBIAN/control | 0 .../pkg-dir-symlink-ext-1/DEBIAN/postinst | 6 ++ .../pkg-dir-symlink-ext-1/DEBIAN/postrm | 6 ++ .../pkg-dir-symlink-ext-1/DEBIAN/preinst | 6 ++ .../pkg-dir-symlink-ext-1/test-path/test-subpath | 1 + .../pkg-dir-symlink-int-0/DEBIAN/control | 0 .../test-path/test-subpath}/file-normal | 0 .../pkg-dir-symlink-int-1/DEBIAN/control | 0 .../pkg-dir-symlink-int-1/DEBIAN/postinst | 6 ++ .../pkg-dir-symlink-int-1/DEBIAN/postrm | 6 ++ .../pkg-dir-symlink-int-1/DEBIAN/preinst | 6 ++ .../pkg-dir-symlink-int-1/test-dir}/file-other | 0 .../pkg-dir-symlink-int-1/test-path/test-subpath | 1 + .../Makefile | 0 .../pkg-dir-real/DEBIAN/control | 0 .../pkg-dir-real/test-dir/file-dir | 0 .../pkg-dir-symlink-0/DEBIAN/control | 0 .../pkg-dir-symlink-0/test-symlink | 0 .../pkg-dir-symlink-1/DEBIAN/control | 0 .../pkg-dir-symlink-1/DEBIAN/postinst | 0 .../pkg-dir-symlink-1/DEBIAN/postrm | 0 .../pkg-dir-symlink-1/DEBIAN/preinst | 0 .../pkg-dir-symlink-1/test-symlink/file-owned | 0 .../Makefile | 8 +- .../pkg-dir-real/DEBIAN/control | 0 .../pkg-dir-real/test-dir/file-dir | 0 .../pkg-dir-symlink-0/DEBIAN/control | 0 .../pkg-dir-symlink-0/test-path/test-symlink | 1 + .../pkg-dir-symlink-1/DEBIAN/control | 0 .../pkg-dir-symlink-1/DEBIAN/postinst | 6 ++ .../pkg-dir-symlink-1/DEBIAN/postrm | 6 ++ .../pkg-dir-symlink-1/DEBIAN/preinst | 6 ++ .../test-path}/test-symlink/file-owned | 0 77 files changed, 130 insertions(+), 51 deletions(-) diff --git a/Makefile b/Makefile index 32f5a2f91..d2bc251c0 100644 --- a/Makefile +++ b/Makefile @@ -71,8 +71,10 @@ TESTS_PASS += t-conffile-versioned-replaces-downgrade TESTS_PASS += t-conffile-rename TESTS_PASS += t-package-type TESTS_PASS += t-symlink-dir -TESTS_PASS += t-switch-symlink-to-dir -TESTS_PASS += t-switch-dir-to-symlink +TESTS_PASS += t-switch-symlink-abs-to-dir +TESTS_PASS += t-switch-symlink-rel-to-dir +TESTS_PASS += t-switch-dir-to-symlink-abs +TESTS_PASS += t-switch-dir-to-symlink-rel TESTS_PASS += t-substvars TESTS_PASS += t-failinst-failrm TESTS_PASS += t-dir-extension-check diff --git a/t-switch-dir-to-symlink/Makefile b/t-switch-dir-to-symlink-abs/Makefile similarity index 100% copy from t-switch-dir-to-symlink/Makefile copy to t-switch-dir-to-symlink-abs/Makefile diff --git a/t-switch-dir-to-symlink/pkg-dir-conffile-0/DEBIAN/conffiles b/t-switch-dir-to-symlink-abs/pkg-dir-conffile-0/DEBIAN/conffiles similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-conffile-0/DEBIAN/conffiles rename to t-switch-dir-to-symlink-abs/pkg-dir-conffile-0/DEBIAN/conffiles diff --git a/t-switch-dir-to-symlink/pkg-dir-conffile-0/DEBIAN/control b/t-switch-dir-to-symlink-abs/pkg-dir-conffile-0/DEBIAN/control similarity index 100% copy from t-switch-dir-to-symlink/pkg-dir-conffile-0/DEBIAN/control copy to t-switch-dir-to-symlink-abs/pkg-dir-conffile-0/DEBIAN/control diff --git a/t-switch-dir-to-symlink/pkg-dir-conffile-0/test-path/file-conf b/t-switch-dir-to-symlink-abs/pkg-dir-conffile-0/test-path/file-conf similarity index 100% copy from t-switch-dir-to-symlink/pkg-dir-conffile-0/test-path/file-conf copy to t-switch-dir-to-symlink-abs/pkg-dir-conffile-0/test-path/file-conf diff --git a/t-switch-dir-to-symlink/pkg-dir-conffile-1/DEBIAN/control b/t-switch-dir-to-symlink-abs/pkg-dir-conffile-1/DEBIAN/control similarity index 100% copy from t-switch-dir-to-symlink/pkg-dir-conffile-1/DEBIAN/control copy to t-switch-dir-to-symlink-abs/pkg-dir-conffile-1/DEBIAN/control diff --git a/t-switch-dir-to-symlink/pkg-dir-conffile-1/DEBIAN/postinst b/t-switch-dir-to-symlink-abs/pkg-dir-conffile-1/DEBIAN/postinst similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-conffile-1/DEBIAN/postinst rename to t-switch-dir-to-symlink-abs/pkg-dir-conffile-1/DEBIAN/postinst diff --git a/t-switch-dir-to-symlink/pkg-dir-conffile-1/DEBIAN/postrm b/t-switch-dir-to-symlink-abs/pkg-dir-conffile-1/DEBIAN/postrm similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-conffile-1/DEBIAN/postrm rename to t-switch-dir-to-symlink-abs/pkg-dir-conffile-1/DEBIAN/postrm diff --git a/t-switch-dir-to-symlink/pkg-dir-conffile-1/DEBIAN/preinst b/t-switch-dir-to-symlink-abs/pkg-dir-conffile-1/DEBIAN/preinst similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-conffile-1/DEBIAN/preinst rename to t-switch-dir-to-symlink-abs/pkg-dir-conffile-1/DEBIAN/preinst diff --git a/t-switch-dir-to-symlink/pkg-dir-conffile-1/test-path b/t-switch-dir-to-symlink-abs/pkg-dir-conffile-1/test-path similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-conffile-1/test-path rename to t-switch-dir-to-symlink-abs/pkg-dir-conffile-1/test-path diff --git a/t-switch-dir-to-symlink/pkg-dir-file-moved/DEBIAN/control b/t-switch-dir-to-symlink-abs/pkg-dir-file-moved/DEBIAN/control similarity index 100% copy from t-switch-dir-to-symlink/pkg-dir-file-moved/DEBIAN/control copy to t-switch-dir-to-symlink-abs/pkg-dir-file-moved/DEBIAN/control diff --git a/t-switch-dir-to-symlink/pkg-dir-file-moved/test-dir/file-normal b/t-switch-dir-to-symlink-abs/pkg-dir-file-moved/test-dir/file-normal similarity index 100% copy from t-switch-dir-to-symlink/pkg-dir-file-moved/test-dir/file-normal copy to t-switch-dir-to-symlink-abs/pkg-dir-file-moved/test-dir/file-normal diff --git a/t-switch-dir-to-symlink/pkg-dir-file-other/DEBIAN/control b/t-switch-dir-to-symlink-abs/pkg-dir-file-other/DEBIAN/control similarity index 100% copy from t-switch-dir-to-symlink/pkg-dir-file-other/DEBIAN/control copy to t-switch-dir-to-symlink-abs/pkg-dir-file-other/DEBIAN/control diff --git a/t-switch-dir-to-symlink/pkg-dir-file-other/test-path/file-other b/t-switch-dir-to-symlink-abs/pkg-dir-file-other/test-path/file-other similarity index 100% copy from t-switch-dir-to-symlink/pkg-dir-file-other/test-path/file-other copy to t-switch-dir-to-symlink-abs/pkg-dir-file-other/test-path/file-other diff --git a/t-switch-dir-to-symlink/pkg-dir-symlink-ext-0/DEBIAN/control b/t-switch-dir-to-symlink-abs/pkg-dir-symlink-ext-0/DEBIAN/control similarity index 100% copy from t-switch-dir-to-symlink/pkg-dir-symlink-ext-0/DEBIAN/control copy to t-switch-dir-to-symlink-abs/pkg-dir-symlink-ext-0/DEBIAN/control diff --git a/t-switch-dir-to-symlink/pkg-dir-symlink-ext-0/test-path/file-normal b/t-switch-dir-to-symlink-abs/pkg-dir-symlink-ext-0/test-path/file-normal similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-symlink-ext-0/test-path/file-normal rename to t-switch-dir-to-symlink-abs/pkg-dir-symlink-ext-0/test-path/file-normal diff --git a/t-switch-dir-to-symlink/pkg-dir-symlink-ext-1/DEBIAN/control b/t-switch-dir-to-symlink-abs/pkg-dir-symlink-ext-1/DEBIAN/control similarity index 100% copy from t-switch-dir-to-symlink/pkg-dir-symlink-ext-1/DEBIAN/control copy to t-switch-dir-to-symlink-abs/pkg-dir-symlink-ext-1/DEBIAN/control diff --git a/t-switch-dir-to-symlink/pkg-dir-symlink-ext-1/DEBIAN/postinst b/t-switch-dir-to-symlink-abs/pkg-dir-symlink-ext-1/DEBIAN/postinst similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-symlink-ext-1/DEBIAN/postinst rename to t-switch-dir-to-symlink-abs/pkg-dir-symlink-ext-1/DEBIAN/postinst diff --git a/t-switch-dir-to-symlink/pkg-dir-symlink-ext-1/DEBIAN/postrm b/t-switch-dir-to-symlink-abs/pkg-dir-symlink-ext-1/DEBIAN/postrm similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-symlink-ext-1/DEBIAN/postrm rename to t-switch-dir-to-symlink-abs/pkg-dir-symlink-ext-1/DEBIAN/postrm diff --git a/t-switch-dir-to-symlink/pkg-dir-symlink-ext-1/DEBIAN/preinst b/t-switch-dir-to-symlink-abs/pkg-dir-symlink-ext-1/DEBIAN/preinst similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-symlink-ext-1/DEBIAN/preinst rename to t-switch-dir-to-symlink-abs/pkg-dir-symlink-ext-1/DEBIAN/preinst diff --git a/t-switch-dir-to-symlink/pkg-dir-symlink-ext-1/test-path b/t-switch-dir-to-symlink-abs/pkg-dir-symlink-ext-1/test-path similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-symlink-ext-1/test-path rename to t-switch-dir-to-symlink-abs/pkg-dir-symlink-ext-1/test-path diff --git a/t-switch-dir-to-symlink/pkg-dir-symlink-int-0/DEBIAN/control b/t-switch-dir-to-symlink-abs/pkg-dir-symlink-int-0/DEBIAN/control similarity index 100% copy from t-switch-dir-to-symlink/pkg-dir-symlink-int-0/DEBIAN/control copy to t-switch-dir-to-symlink-abs/pkg-dir-symlink-int-0/DEBIAN/control diff --git a/t-switch-dir-to-symlink/pkg-dir-symlink-int-0/test-path/file-normal b/t-switch-dir-to-symlink-abs/pkg-dir-symlink-int-0/test-path/file-normal similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-symlink-int-0/test-path/file-normal rename to t-switch-dir-to-symlink-abs/pkg-dir-symlink-int-0/test-path/file-normal diff --git a/t-switch-dir-to-symlink/pkg-dir-symlink-int-1/DEBIAN/control b/t-switch-dir-to-symlink-abs/pkg-dir-symlink-int-1/DEBIAN/control similarity index 100% copy from t-switch-dir-to-symlink/pkg-dir-symlink-int-1/DEBIAN/control copy to t-switch-dir-to-symlink-abs/pkg-dir-symlink-int-1/DEBIAN/control diff --git a/t-switch-dir-to-symlink/pkg-dir-symlink-int-1/DEBIAN/postinst b/t-switch-dir-to-symlink-abs/pkg-dir-symlink-int-1/DEBIAN/postinst similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-symlink-int-1/DEBIAN/postinst rename to t-switch-dir-to-symlink-abs/pkg-dir-symlink-int-1/DEBIAN/postinst diff --git a/t-switch-dir-to-symlink/pkg-dir-symlink-int-1/DEBIAN/postrm b/t-switch-dir-to-symlink-abs/pkg-dir-symlink-int-1/DEBIAN/postrm similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-symlink-int-1/DEBIAN/postrm rename to t-switch-dir-to-symlink-abs/pkg-dir-symlink-int-1/DEBIAN/postrm diff --git a/t-switch-dir-to-symlink/pkg-dir-symlink-int-1/DEBIAN/preinst b/t-switch-dir-to-symlink-abs/pkg-dir-symlink-int-1/DEBIAN/preinst similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-symlink-int-1/DEBIAN/preinst rename to t-switch-dir-to-symlink-abs/pkg-dir-symlink-int-1/DEBIAN/preinst diff --git a/t-switch-dir-to-symlink/pkg-dir-symlink-int-1/test-dir/file-other b/t-switch-dir-to-symlink-abs/pkg-dir-symlink-int-1/test-dir/file-other similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-symlink-int-1/test-dir/file-other rename to t-switch-dir-to-symlink-abs/pkg-dir-symlink-int-1/test-dir/file-other diff --git a/t-switch-dir-to-symlink/pkg-dir-symlink-int-1/test-path b/t-switch-dir-to-symlink-abs/pkg-dir-symlink-int-1/test-path similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-symlink-int-1/test-path rename to t-switch-dir-to-symlink-abs/pkg-dir-symlink-int-1/test-path diff --git a/t-switch-dir-to-symlink/Makefile b/t-switch-dir-to-symlink-rel/Makefile similarity index 65% rename from t-switch-dir-to-symlink/Makefile rename to t-switch-dir-to-symlink-rel/Makefile index c5f8c84cd..a34794433 100644 --- a/t-switch-dir-to-symlink/Makefile +++ b/t-switch-dir-to-symlink-rel/Makefile @@ -8,31 +8,31 @@ include ../Test.mk test-case: # Cannot switch a directory containing conffiles $(DPKG_INSTALL) pkg-dir-conffile-0.deb - test -d /test-path + test -d /test-path/test-subpath ! $(DPKG_INSTALL) pkg-dir-conffile-1.deb - test -d /test-path + test -d /test-path/test-subpath $(DPKG_PURGE) pkg-dir-conffile # Cannot switch a directory containing files owned by another package $(DPKG_INSTALL) pkg-dir-file-other.deb $(DPKG_INSTALL) pkg-dir-symlink-int-0.deb - test -d /test-path - ! test -h /test-path + test -d /test-path/test-subpath + ! test -h /test-path/test-subpath ! $(DPKG_INSTALL) pkg-dir-symlink-int-1.deb - test -d /test-path - ! test -h /test-path + test -d /test-path/test-subpath + ! test -h /test-path/test-subpath $(DPKG_PURGE) pkg-dir-symlink-int $(DPKG_PURGE) pkg-dir-file-other # Cannot switch a directory containing local files $(DPKG_INSTALL) pkg-dir-symlink-int-0.deb - test -d /test-path - ! test -h /test-path - touch '/test-path/local file' + test -d /test-path/test-subpath + ! test -h /test-path/test-subpath + touch '/test-path/test-subpath/local file' ! $(DPKG_INSTALL) pkg-dir-symlink-int-1.deb - test -d /test-path - ! test -h /test-path - rm '/test-path/local file' + test -d /test-path/test-subpath + ! test -h /test-path/test-subpath + rm '/test-path/test-subpath/local file' $(DPKG_PURGE) pkg-dir-symlink-int # @@ -42,50 +42,50 @@ test-case: # Switch a directory to a symlink, contents moved within the package, # with intermediate full installs. $(DPKG_INSTALL) pkg-dir-symlink-int-0.deb - test -d /test-path - ! test -h /test-path + test -d /test-path/test-subpath + ! test -h /test-path/test-subpath $(DPKG_INSTALL) pkg-dir-symlink-int-1.deb - test -h /test-path + test -h /test-path/test-subpath $(DPKG_PURGE) pkg-dir-symlink-int - ! test -e /test-path + ! test -e /test-path/test-subpath # Switch a directory to a symlink, contents moved within the package, # with full install, upgrade with upack and configure. $(DPKG_INSTALL) pkg-dir-symlink-int-0.deb - ! test -h /test-path - test -d /test-path + ! test -h /test-path/test-subpath + test -d /test-path/test-subpath $(DPKG_UNPACK) pkg-dir-symlink-int-1.deb - ! test -h /test-path - test -d /test-path + ! test -h /test-path/test-subpath + test -d /test-path/test-subpath $(DPKG_CONFIGURE) pkg-dir-symlink-int - test -h /test-path + test -h /test-path/test-subpath $(DPKG_PURGE) pkg-dir-symlink-int - ! test -e /test-path + ! test -e /test-path/test-subpath # Switch a directory to a symlink, contents moved within the package, # with two unpacks and configure. $(DPKG_UNPACK) pkg-dir-symlink-int-0.deb - ! test -h /test-path - test -d /test-path + ! test -h /test-path/test-subpath + test -d /test-path/test-subpath $(DPKG_UNPACK) pkg-dir-symlink-int-1.deb - ! test -h /test-path - test -d /test-path + ! test -h /test-path/test-subpath + test -d /test-path/test-subpath $(DPKG_CONFIGURE) pkg-dir-symlink-int - test -h /test-path + test -h /test-path/test-subpath $(DPKG_PURGE) pkg-dir-symlink-int - ! test -e /test-path + ! test -e /test-path/test-subpath # Switch a directory to a symlink, contents moved to another package, # with intermediate full installs. $(DPKG_INSTALL) pkg-dir-symlink-ext-0.deb - test -d /test-path + test -d /test-path/test-subpath $(DPKG_INSTALL) pkg-dir-file-moved.deb - test -d /test-path + test -d /test-path/test-subpath test -d /test-dir $(DPKG_INSTALL) pkg-dir-symlink-ext-1.deb - test -h /test-path - test -d /test-path - test "`readlink -f /test-path`" = "/test-dir" + test -h /test-path/test-subpath + test -d /test-path/test-subpath + test "`readlink /test-path/test-subpath`" = "../test-dir" ! test -h /test-dir test -d /test-dir test -f /test-dir/file-normal @@ -95,17 +95,17 @@ test-case: # Switch a directory to a symlink, contents moved to another package, # with full installs, upgrade with upack and configure. $(DPKG_INSTALL) pkg-dir-symlink-ext-0.deb - test -d /test-path + test -d /test-path/test-subpath $(DPKG_INSTALL) pkg-dir-file-moved.deb - test -d /test-path + test -d /test-path/test-subpath test -d /test-dir $(DPKG_UNPACK) pkg-dir-symlink-ext-1.deb - test -d /test-path + test -d /test-path/test-subpath test -d /test-dir $(DPKG_CONFIGURE) -a - test -h /test-path - test -d /test-path - test "`readlink -f /test-path`" = "/test-dir" + test -h /test-path/test-subpath + test -d /test-path/test-subpath + test "`readlink /test-path/test-subpath`" = "../test-dir" ! test -h /test-dir test -d /test-dir test -f /test-dir/file-normal @@ -115,17 +115,17 @@ test-case: # Switch a directory to a symlink, contents moved to another package, # with three unpacks and configure. $(DPKG_UNPACK) pkg-dir-symlink-ext-0.deb - test -d /test-path + test -d /test-path/test-subpath $(DPKG_UNPACK) pkg-dir-file-moved.deb - test -d /test-path + test -d /test-path/test-subpath test -d /test-dir $(DPKG_UNPACK) pkg-dir-symlink-ext-1.deb - test -d /test-path + test -d /test-path/test-subpath test -d /test-dir $(DPKG_CONFIGURE) -a - test -h /test-path - test -d /test-path - test "`readlink -f /test-path`" = "/test-dir" + test -h /test-path/test-subpath + test -d /test-path/test-subpath + test "`readlink /test-path/test-subpath`" = "../test-dir" ! test -h /test-dir test -d /test-dir test -f /test-dir/file-normal diff --git a/t-switch-dir-to-symlink-rel/pkg-dir-conffile-0/DEBIAN/conffiles b/t-switch-dir-to-symlink-rel/pkg-dir-conffile-0/DEBIAN/conffiles new file mode 100644 index 000000000..77b39dafb --- /dev/null +++ b/t-switch-dir-to-symlink-rel/pkg-dir-conffile-0/DEBIAN/conffiles @@ -0,0 +1 @@ +/test-path/test-subpath/file-conf diff --git a/t-switch-dir-to-symlink/pkg-dir-conffile-0/DEBIAN/control b/t-switch-dir-to-symlink-rel/pkg-dir-conffile-0/DEBIAN/control similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-conffile-0/DEBIAN/control rename to t-switch-dir-to-symlink-rel/pkg-dir-conffile-0/DEBIAN/control diff --git a/t-switch-dir-to-symlink/pkg-dir-conffile-0/test-path/file-conf b/t-switch-dir-to-symlink-rel/pkg-dir-conffile-0/test-path/test-subpath/file-conf similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-conffile-0/test-path/file-conf rename to t-switch-dir-to-symlink-rel/pkg-dir-conffile-0/test-path/test-subpath/file-conf diff --git a/t-switch-dir-to-symlink/pkg-dir-conffile-1/DEBIAN/control b/t-switch-dir-to-symlink-rel/pkg-dir-conffile-1/DEBIAN/control similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-conffile-1/DEBIAN/control rename to t-switch-dir-to-symlink-rel/pkg-dir-conffile-1/DEBIAN/control diff --git a/t-switch-dir-to-symlink-rel/pkg-dir-conffile-1/DEBIAN/postinst b/t-switch-dir-to-symlink-rel/pkg-dir-conffile-1/DEBIAN/postinst new file mode 100755 index 000000000..572dfa205 --- /dev/null +++ b/t-switch-dir-to-symlink-rel/pkg-dir-conffile-1/DEBIAN/postinst @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +if dpkg-maintscript-helper supports dir_to_symlink; then + dpkg-maintscript-helper dir_to_symlink \ + /test-path/test-subpath ../test-dir 0 -- "$@" +fi diff --git a/t-switch-dir-to-symlink-rel/pkg-dir-conffile-1/DEBIAN/postrm b/t-switch-dir-to-symlink-rel/pkg-dir-conffile-1/DEBIAN/postrm new file mode 100755 index 000000000..572dfa205 --- /dev/null +++ b/t-switch-dir-to-symlink-rel/pkg-dir-conffile-1/DEBIAN/postrm @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +if dpkg-maintscript-helper supports dir_to_symlink; then + dpkg-maintscript-helper dir_to_symlink \ + /test-path/test-subpath ../test-dir 0 -- "$@" +fi diff --git a/t-switch-dir-to-symlink-rel/pkg-dir-conffile-1/DEBIAN/preinst b/t-switch-dir-to-symlink-rel/pkg-dir-conffile-1/DEBIAN/preinst new file mode 100755 index 000000000..572dfa205 --- /dev/null +++ b/t-switch-dir-to-symlink-rel/pkg-dir-conffile-1/DEBIAN/preinst @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +if dpkg-maintscript-helper supports dir_to_symlink; then + dpkg-maintscript-helper dir_to_symlink \ + /test-path/test-subpath ../test-dir 0 -- "$@" +fi diff --git a/t-switch-dir-to-symlink-rel/pkg-dir-conffile-1/test-path/test-subpath b/t-switch-dir-to-symlink-rel/pkg-dir-conffile-1/test-path/test-subpath new file mode 120000 index 000000000..eadec4b15 --- /dev/null +++ b/t-switch-dir-to-symlink-rel/pkg-dir-conffile-1/test-path/test-subpath @@ -0,0 +1 @@ +../test-dir \ No newline at end of file diff --git a/t-switch-dir-to-symlink/pkg-dir-file-moved/DEBIAN/control b/t-switch-dir-to-symlink-rel/pkg-dir-file-moved/DEBIAN/control similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-file-moved/DEBIAN/control rename to t-switch-dir-to-symlink-rel/pkg-dir-file-moved/DEBIAN/control diff --git a/t-switch-dir-to-symlink/pkg-dir-file-moved/test-dir/file-normal b/t-switch-dir-to-symlink-rel/pkg-dir-file-moved/test-dir/file-normal similarity index 100% copy from t-switch-dir-to-symlink/pkg-dir-file-moved/test-dir/file-normal copy to t-switch-dir-to-symlink-rel/pkg-dir-file-moved/test-dir/file-normal diff --git a/t-switch-dir-to-symlink/pkg-dir-file-other/DEBIAN/control b/t-switch-dir-to-symlink-rel/pkg-dir-file-other/DEBIAN/control similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-file-other/DEBIAN/control rename to t-switch-dir-to-symlink-rel/pkg-dir-file-other/DEBIAN/control diff --git a/t-switch-dir-to-symlink/pkg-dir-file-other/test-path/file-other b/t-switch-dir-to-symlink-rel/pkg-dir-file-other/test-path/test-subpath/file-other similarity index 100% copy from t-switch-dir-to-symlink/pkg-dir-file-other/test-path/file-other copy to t-switch-dir-to-symlink-rel/pkg-dir-file-other/test-path/test-subpath/file-other diff --git a/t-switch-dir-to-symlink/pkg-dir-symlink-ext-0/DEBIAN/control b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-ext-0/DEBIAN/control similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-symlink-ext-0/DEBIAN/control rename to t-switch-dir-to-symlink-rel/pkg-dir-symlink-ext-0/DEBIAN/control diff --git a/t-switch-dir-to-symlink/pkg-dir-file-moved/test-dir/file-normal b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-ext-0/test-path/test-subpath/file-normal similarity index 100% copy from t-switch-dir-to-symlink/pkg-dir-file-moved/test-dir/file-normal copy to t-switch-dir-to-symlink-rel/pkg-dir-symlink-ext-0/test-path/test-subpath/file-normal diff --git a/t-switch-dir-to-symlink/pkg-dir-symlink-ext-1/DEBIAN/control b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-ext-1/DEBIAN/control similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-symlink-ext-1/DEBIAN/control rename to t-switch-dir-to-symlink-rel/pkg-dir-symlink-ext-1/DEBIAN/control diff --git a/t-switch-dir-to-symlink-rel/pkg-dir-symlink-ext-1/DEBIAN/postinst b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-ext-1/DEBIAN/postinst new file mode 100755 index 000000000..572dfa205 --- /dev/null +++ b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-ext-1/DEBIAN/postinst @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +if dpkg-maintscript-helper supports dir_to_symlink; then + dpkg-maintscript-helper dir_to_symlink \ + /test-path/test-subpath ../test-dir 0 -- "$@" +fi diff --git a/t-switch-dir-to-symlink-rel/pkg-dir-symlink-ext-1/DEBIAN/postrm b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-ext-1/DEBIAN/postrm new file mode 100755 index 000000000..572dfa205 --- /dev/null +++ b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-ext-1/DEBIAN/postrm @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +if dpkg-maintscript-helper supports dir_to_symlink; then + dpkg-maintscript-helper dir_to_symlink \ + /test-path/test-subpath ../test-dir 0 -- "$@" +fi diff --git a/t-switch-dir-to-symlink-rel/pkg-dir-symlink-ext-1/DEBIAN/preinst b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-ext-1/DEBIAN/preinst new file mode 100755 index 000000000..572dfa205 --- /dev/null +++ b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-ext-1/DEBIAN/preinst @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +if dpkg-maintscript-helper supports dir_to_symlink; then + dpkg-maintscript-helper dir_to_symlink \ + /test-path/test-subpath ../test-dir 0 -- "$@" +fi diff --git a/t-switch-dir-to-symlink-rel/pkg-dir-symlink-ext-1/test-path/test-subpath b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-ext-1/test-path/test-subpath new file mode 120000 index 000000000..eadec4b15 --- /dev/null +++ b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-ext-1/test-path/test-subpath @@ -0,0 +1 @@ +../test-dir \ No newline at end of file diff --git a/t-switch-dir-to-symlink/pkg-dir-symlink-int-0/DEBIAN/control b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-int-0/DEBIAN/control similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-symlink-int-0/DEBIAN/control rename to t-switch-dir-to-symlink-rel/pkg-dir-symlink-int-0/DEBIAN/control diff --git a/t-switch-dir-to-symlink/pkg-dir-file-moved/test-dir/file-normal b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-int-0/test-path/test-subpath/file-normal similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-file-moved/test-dir/file-normal rename to t-switch-dir-to-symlink-rel/pkg-dir-symlink-int-0/test-path/test-subpath/file-normal diff --git a/t-switch-dir-to-symlink/pkg-dir-symlink-int-1/DEBIAN/control b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-int-1/DEBIAN/control similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-symlink-int-1/DEBIAN/control rename to t-switch-dir-to-symlink-rel/pkg-dir-symlink-int-1/DEBIAN/control diff --git a/t-switch-dir-to-symlink-rel/pkg-dir-symlink-int-1/DEBIAN/postinst b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-int-1/DEBIAN/postinst new file mode 100755 index 000000000..572dfa205 --- /dev/null +++ b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-int-1/DEBIAN/postinst @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +if dpkg-maintscript-helper supports dir_to_symlink; then + dpkg-maintscript-helper dir_to_symlink \ + /test-path/test-subpath ../test-dir 0 -- "$@" +fi diff --git a/t-switch-dir-to-symlink-rel/pkg-dir-symlink-int-1/DEBIAN/postrm b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-int-1/DEBIAN/postrm new file mode 100755 index 000000000..572dfa205 --- /dev/null +++ b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-int-1/DEBIAN/postrm @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +if dpkg-maintscript-helper supports dir_to_symlink; then + dpkg-maintscript-helper dir_to_symlink \ + /test-path/test-subpath ../test-dir 0 -- "$@" +fi diff --git a/t-switch-dir-to-symlink-rel/pkg-dir-symlink-int-1/DEBIAN/preinst b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-int-1/DEBIAN/preinst new file mode 100755 index 000000000..572dfa205 --- /dev/null +++ b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-int-1/DEBIAN/preinst @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +if dpkg-maintscript-helper supports dir_to_symlink; then + dpkg-maintscript-helper dir_to_symlink \ + /test-path/test-subpath ../test-dir 0 -- "$@" +fi diff --git a/t-switch-dir-to-symlink/pkg-dir-file-other/test-path/file-other b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-int-1/test-dir/file-other similarity index 100% rename from t-switch-dir-to-symlink/pkg-dir-file-other/test-path/file-other rename to t-switch-dir-to-symlink-rel/pkg-dir-symlink-int-1/test-dir/file-other diff --git a/t-switch-dir-to-symlink-rel/pkg-dir-symlink-int-1/test-path/test-subpath b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-int-1/test-path/test-subpath new file mode 120000 index 000000000..eadec4b15 --- /dev/null +++ b/t-switch-dir-to-symlink-rel/pkg-dir-symlink-int-1/test-path/test-subpath @@ -0,0 +1 @@ +../test-dir \ No newline at end of file diff --git a/t-switch-symlink-to-dir/Makefile b/t-switch-symlink-abs-to-dir/Makefile similarity index 100% copy from t-switch-symlink-to-dir/Makefile copy to t-switch-symlink-abs-to-dir/Makefile diff --git a/t-switch-symlink-to-dir/pkg-dir-real/DEBIAN/control b/t-switch-symlink-abs-to-dir/pkg-dir-real/DEBIAN/control similarity index 100% copy from t-switch-symlink-to-dir/pkg-dir-real/DEBIAN/control copy to t-switch-symlink-abs-to-dir/pkg-dir-real/DEBIAN/control diff --git a/t-switch-symlink-to-dir/pkg-dir-real/test-dir/file-dir b/t-switch-symlink-abs-to-dir/pkg-dir-real/test-dir/file-dir similarity index 100% copy from t-switch-symlink-to-dir/pkg-dir-real/test-dir/file-dir copy to t-switch-symlink-abs-to-dir/pkg-dir-real/test-dir/file-dir diff --git a/t-switch-symlink-to-dir/pkg-dir-symlink-0/DEBIAN/control b/t-switch-symlink-abs-to-dir/pkg-dir-symlink-0/DEBIAN/control similarity index 100% copy from t-switch-symlink-to-dir/pkg-dir-symlink-0/DEBIAN/control copy to t-switch-symlink-abs-to-dir/pkg-dir-symlink-0/DEBIAN/control diff --git a/t-switch-symlink-to-dir/pkg-dir-symlink-0/test-symlink b/t-switch-symlink-abs-to-dir/pkg-dir-symlink-0/test-symlink similarity index 100% rename from t-switch-symlink-to-dir/pkg-dir-symlink-0/test-symlink rename to t-switch-symlink-abs-to-dir/pkg-dir-symlink-0/test-symlink diff --git a/t-switch-symlink-to-dir/pkg-dir-symlink-1/DEBIAN/control b/t-switch-symlink-abs-to-dir/pkg-dir-symlink-1/DEBIAN/control similarity index 100% copy from t-switch-symlink-to-dir/pkg-dir-symlink-1/DEBIAN/control copy to t-switch-symlink-abs-to-dir/pkg-dir-symlink-1/DEBIAN/control diff --git a/t-switch-symlink-to-dir/pkg-dir-symlink-1/DEBIAN/postinst b/t-switch-symlink-abs-to-dir/pkg-dir-symlink-1/DEBIAN/postinst similarity index 100% rename from t-switch-symlink-to-dir/pkg-dir-symlink-1/DEBIAN/postinst rename to t-switch-symlink-abs-to-dir/pkg-dir-symlink-1/DEBIAN/postinst diff --git a/t-switch-symlink-to-dir/pkg-dir-symlink-1/DEBIAN/postrm b/t-switch-symlink-abs-to-dir/pkg-dir-symlink-1/DEBIAN/postrm similarity index 100% rename from t-switch-symlink-to-dir/pkg-dir-symlink-1/DEBIAN/postrm rename to t-switch-symlink-abs-to-dir/pkg-dir-symlink-1/DEBIAN/postrm diff --git a/t-switch-symlink-to-dir/pkg-dir-symlink-1/DEBIAN/preinst b/t-switch-symlink-abs-to-dir/pkg-dir-symlink-1/DEBIAN/preinst similarity index 100% rename from t-switch-symlink-to-dir/pkg-dir-symlink-1/DEBIAN/preinst rename to t-switch-symlink-abs-to-dir/pkg-dir-symlink-1/DEBIAN/preinst diff --git a/t-switch-symlink-to-dir/pkg-dir-symlink-1/test-symlink/file-owned b/t-switch-symlink-abs-to-dir/pkg-dir-symlink-1/test-symlink/file-owned similarity index 100% copy from t-switch-symlink-to-dir/pkg-dir-symlink-1/test-symlink/file-owned copy to t-switch-symlink-abs-to-dir/pkg-dir-symlink-1/test-symlink/file-owned diff --git a/t-switch-symlink-to-dir/Makefile b/t-switch-symlink-rel-to-dir/Makefile similarity index 71% rename from t-switch-symlink-to-dir/Makefile rename to t-switch-symlink-rel-to-dir/Makefile index 0d21d6335..79a6a1417 100644 --- a/t-switch-symlink-to-dir/Makefile +++ b/t-switch-symlink-rel-to-dir/Makefile @@ -6,14 +6,14 @@ test-case: $(DPKG_INSTALL) pkg-dir-real.deb $(DPKG_INSTALL) pkg-dir-symlink-0.deb - test -h /test-symlink + test -h /test-path/test-symlink $(DPKG_INSTALL) pkg-dir-symlink-1.deb - ! test -h /test-symlink - test -d /test-symlink + ! test -h /test-path/test-symlink + test -d /test-path/test-symlink $(DPKG_PURGE) pkg-dir-symlink - ! test -e /test-symlink + ! test -e /test-path/test-symlink $(DPKG_PURGE) pkg-dir-real diff --git a/t-switch-symlink-to-dir/pkg-dir-real/DEBIAN/control b/t-switch-symlink-rel-to-dir/pkg-dir-real/DEBIAN/control similarity index 100% rename from t-switch-symlink-to-dir/pkg-dir-real/DEBIAN/control rename to t-switch-symlink-rel-to-dir/pkg-dir-real/DEBIAN/control diff --git a/t-switch-symlink-to-dir/pkg-dir-real/test-dir/file-dir b/t-switch-symlink-rel-to-dir/pkg-dir-real/test-dir/file-dir similarity index 100% rename from t-switch-symlink-to-dir/pkg-dir-real/test-dir/file-dir rename to t-switch-symlink-rel-to-dir/pkg-dir-real/test-dir/file-dir diff --git a/t-switch-symlink-to-dir/pkg-dir-symlink-0/DEBIAN/control b/t-switch-symlink-rel-to-dir/pkg-dir-symlink-0/DEBIAN/control similarity index 100% rename from t-switch-symlink-to-dir/pkg-dir-symlink-0/DEBIAN/control rename to t-switch-symlink-rel-to-dir/pkg-dir-symlink-0/DEBIAN/control diff --git a/t-switch-symlink-rel-to-dir/pkg-dir-symlink-0/test-path/test-symlink b/t-switch-symlink-rel-to-dir/pkg-dir-symlink-0/test-path/test-symlink new file mode 120000 index 000000000..eadec4b15 --- /dev/null +++ b/t-switch-symlink-rel-to-dir/pkg-dir-symlink-0/test-path/test-symlink @@ -0,0 +1 @@ +../test-dir \ No newline at end of file diff --git a/t-switch-symlink-to-dir/pkg-dir-symlink-1/DEBIAN/control b/t-switch-symlink-rel-to-dir/pkg-dir-symlink-1/DEBIAN/control similarity index 100% rename from t-switch-symlink-to-dir/pkg-dir-symlink-1/DEBIAN/control rename to t-switch-symlink-rel-to-dir/pkg-dir-symlink-1/DEBIAN/control diff --git a/t-switch-symlink-rel-to-dir/pkg-dir-symlink-1/DEBIAN/postinst b/t-switch-symlink-rel-to-dir/pkg-dir-symlink-1/DEBIAN/postinst new file mode 100755 index 000000000..89e4fcd2b --- /dev/null +++ b/t-switch-symlink-rel-to-dir/pkg-dir-symlink-1/DEBIAN/postinst @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +if dpkg-maintscript-helper supports symlink_to_dir; then + dpkg-maintscript-helper symlink_to_dir \ + /test-path/test-symlink /test-dir 0 -- "$@" +fi diff --git a/t-switch-symlink-rel-to-dir/pkg-dir-symlink-1/DEBIAN/postrm b/t-switch-symlink-rel-to-dir/pkg-dir-symlink-1/DEBIAN/postrm new file mode 100755 index 000000000..89e4fcd2b --- /dev/null +++ b/t-switch-symlink-rel-to-dir/pkg-dir-symlink-1/DEBIAN/postrm @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +if dpkg-maintscript-helper supports symlink_to_dir; then + dpkg-maintscript-helper symlink_to_dir \ + /test-path/test-symlink /test-dir 0 -- "$@" +fi diff --git a/t-switch-symlink-rel-to-dir/pkg-dir-symlink-1/DEBIAN/preinst b/t-switch-symlink-rel-to-dir/pkg-dir-symlink-1/DEBIAN/preinst new file mode 100755 index 000000000..89e4fcd2b --- /dev/null +++ b/t-switch-symlink-rel-to-dir/pkg-dir-symlink-1/DEBIAN/preinst @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +if dpkg-maintscript-helper supports symlink_to_dir; then + dpkg-maintscript-helper symlink_to_dir \ + /test-path/test-symlink /test-dir 0 -- "$@" +fi diff --git a/t-switch-symlink-to-dir/pkg-dir-symlink-1/test-symlink/file-owned b/t-switch-symlink-rel-to-dir/pkg-dir-symlink-1/test-path/test-symlink/file-owned similarity index 100% rename from t-switch-symlink-to-dir/pkg-dir-symlink-1/test-symlink/file-owned rename to t-switch-symlink-rel-to-dir/pkg-dir-symlink-1/test-path/test-symlink/file-owned -- Dpkg.Org's dpkg
