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=967e990834995a6b3f8d3aa9d2cb12e7a97abdda commit 967e990834995a6b3f8d3aa9d2cb12e7a97abdda Author: Ralf Treinen <trei...@free.fr> AuthorDate: Thu Feb 21 04:40:42 2019 +0100 dpkg-maintscript-helper: Restrict find for dir-to-symlink move to -maxdepth 1 We do not want to move the entries beneath the first depth of the pathname, as when we try to move those, we will have already moved their parent. Closes: #922799 Signed-off-by: Guillem Jover <guil...@debian.org> --- debian/changelog | 2 ++ scripts/dpkg-maintscript-helper.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ec12434ab..7006c9093 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ dpkg (1.19.5) UNRELEASED; urgency=medium Closes: #920880 * dpkg-buildpackage: Clarify the warning/error on short OpenPGP key IDs. Closes: #922039 + * dpkg-maintscript-helper: Restrict find for dir-to-symlink move to + -maxdepth 1. Thanks to Ralf Treinen <trei...@free.fr>. Closes: #922799 * Documentation: - start-stop-daemon(1): Document behavior of --pidfile security checks. Closes: #921557 diff --git a/scripts/dpkg-maintscript-helper.sh b/scripts/dpkg-maintscript-helper.sh index 2865a63d5..a113a938e 100755 --- a/scripts/dpkg-maintscript-helper.sh +++ b/scripts/dpkg-maintscript-helper.sh @@ -465,7 +465,7 @@ finish_dir_to_symlink() ABS_SYMLINK_TARGET="$SYMLINK_TARGET" fi rm "$PATHNAME/.dpkg-staging-dir" - find "$PATHNAME" -mindepth 1 -print0 | \ + find "$PATHNAME" -mindepth 1 -maxdepth 1 -print0 | \ xargs -0 -i% mv -f "%" "$ABS_SYMLINK_TARGET/" # Remove the staging directory. -- Dpkg.Org's dpkg
