diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | scripts/dpkg-maintscript-helper.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index d3956e3..6b3cec6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ dpkg (1.17.7) UNRELEASED; urgency=low - Fix indentation of “Extract options (with -x)” title in dpkg-source(1). - Improve symlink <-> directory switch information in dpkg-maintscript-helper(1). Closes: #739388 + * Use exit instead of return to exit a subshell in dpkg-maintscript-helper. + Thanks to Richard Levitte <richard@levitte.org>. Closes: #738957 [ Updated dpkg translations ] * German (Sven Joachim). diff --git a/scripts/dpkg-maintscript-helper.sh b/scripts/dpkg-maintscript-helper.sh index 9ee10cd..48cbbbf 100755 --- a/scripts/dpkg-maintscript-helper.sh +++ b/scripts/dpkg-maintscript-helper.sh @@ -394,9 +394,9 @@ prepare_dir_to_symlink() package="$1" file="$2" if ! dpkg-query -L "$package" | grep -q -x "$file"; then - return 1 + exit 1 fi - return 0 + exit 0 ' check-files-ownership "$PACKAGE" || \ error "directory '$PATHNAME' contains files not owned by" \ "package $PACKAGE, cannot switch to symlink" |