Message info
 
To:debian-dpkg-cvs@lists.debian.org From:Raphaël Hertzog Subject:[SCM] dpkg\'s main repository branch, master, updated. 1.16.1.2-278-g1b2bd2d Date:Sun, 19 Feb 2012 19:32:16 +0000
 

The following commit has been merged in the master branch:
commit 1b2bd2da73be2467e1ee22c2e40ebf2d5b6f85c9
Author: Raphaël Hertzog <hertzog@debian.org>
Date: Sun Feb 19 20:27:51 2012 +0100

dpkg-maintscript-helper: fix debug output

Print all the arguments instead of only the first one as long messages
were cut over multiple lines, resulting in multiple parameters passed
to the function.

Reported-by: Maarten Bezemer <maarten.bezemer@gmail.com>

diff --git a/debian/changelog b/debian/changelog
index e287c0b..69c0666 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -99,6 +99,7 @@ dpkg (1.16.2) UNRELEASED; urgency=low
removing/renaming a conffile with a "~" suffix as "priorversion"
parameter. Thanks to Sam Morris <sam@robots.org.uk> for the patch.
Closes: #658854
+ * Fix debug output of dpkg-maintscript-helper. LP: #936340

[ Jonathan Nieder ]
* Bump po4a version in Build-Depends to 0.41, since earlier versions do
diff --git a/scripts/dpkg-maintscript-helper.sh b/scripts/dpkg-maintscript-helper.sh
index 8c8b9ac..04dd2b9 100755
--- a/scripts/dpkg-maintscript-helper.sh
+++ b/scripts/dpkg-maintscript-helper.sh
@@ -47,9 +47,9 @@ rm_conffile() {
[ -n "$DPKG_MAINTSCRIPT_NAME" ] || \
error "environment variable DPKG_MAINTSCRIPT_NAME is required"

- debug "Executing $0 rm_conffile in $DPKG_MAINTSCRIPT_NAME "\
+ debug "Executing $0 rm_conffile in $DPKG_MAINTSCRIPT_NAME" \
"of $DPKG_MAINTSCRIPT_PACKAGE"
- debug "CONFFILE=$CONFFILE PACKAGE=$PACKAGE "\
+ debug "CONFFILE=$CONFFILE PACKAGE=$PACKAGE" \
"LASTVERSION=$LASTVERSION ACTION=$1 PARAM=$2"
case "$DPKG_MAINTSCRIPT_NAME" in
preinst)
@@ -150,9 +150,9 @@ mv_conffile() {
[ -n "$DPKG_MAINTSCRIPT_NAME" ] || \
error "environment variable DPKG_MAINTSCRIPT_NAME is required"

- debug "Executing $0 mv_conffile in $DPKG_MAINTSCRIPT_NAME "\
+ debug "Executing $0 mv_conffile in $DPKG_MAINTSCRIPT_NAME" \
"of $DPKG_MAINTSCRIPT_PACKAGE"
- debug "CONFFILE=$OLDCONFFILE -> $NEWCONFFILE PACKAGE=$PACKAGE "\
+ debug "CONFFILE=$OLDCONFFILE -> $NEWCONFFILE PACKAGE=$PACKAGE" \
"LASTVERSION=$LASTVERSION ACTION=$1 PARAM=$2"
case "$DPKG_MAINTSCRIPT_NAME" in
preinst)
@@ -219,7 +219,7 @@ abort_mv_conffile() {
# Common functions
debug() {
if [ -n "$DPKG_DEBUG" ]; then
- echo "DEBUG: $PROGNAME: $1" >&2
+ echo "DEBUG: $PROGNAME: $*" >&2
fi
}


--
dpkg's main repository


--
To UNSUBSCRIBE, email to debian-dpkg-cvs-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org