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=c1e361f60b3a9bc342a4e423fd49a2cce9f34c86 commit c1e361f60b3a9bc342a4e423fd49a2cce9f34c86 Author: Guillem Jover <[email protected]> AuthorDate: Thu Jun 25 18:40:55 2020 +0200 scripts: Fix shell library loading Move the «sh/» directory from the PKGDATADIR assignment to the shell library loading, as this is not really part of the actual PKGDATADIR. Fixes: commit 584d2a5575627f34dd796b550b09c590d34a79ae Fixes: commit 5a683899c5216dd565d21bb9b6592c1c6fde174b --- scripts/dpkg-maintscript-helper.sh | 4 ++-- scripts/dpkg-realpath.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/dpkg-maintscript-helper.sh b/scripts/dpkg-maintscript-helper.sh index 476cbcf7c..459165372 100755 --- a/scripts/dpkg-maintscript-helper.sh +++ b/scripts/dpkg-maintscript-helper.sh @@ -595,9 +595,9 @@ PROGNAME=$(basename "$0") version="unknown" DPKG_ROOT=${DPKG_ROOT:+$(realpath "$DPKG_ROOT")} -PKGDATADIR=scripts/sh +PKGDATADIR=scripts -. "$PKGDATADIR/dpkg-error.sh" +. "$PKGDATADIR/sh/dpkg-error.sh" setup_colors diff --git a/scripts/dpkg-realpath.sh b/scripts/dpkg-realpath.sh index 0f7231488..3b5136cfa 100755 --- a/scripts/dpkg-realpath.sh +++ b/scripts/dpkg-realpath.sh @@ -21,9 +21,9 @@ set -e PROGNAME=$(basename "$0") version="unknown" -PKGDATADIR=scripts/sh +PKGDATADIR=scripts -. "$PKGDATADIR/dpkg-error.sh" +. "$PKGDATADIR/sh/dpkg-error.sh" show_version() { -- Dpkg.Org's dpkg
