diff options
| -rw-r--r-- | pbuilder-loadconfig | 2 | ||||
| -rw-r--r-- | pbuilder-modules | 18 | ||||
| -rw-r--r-- | pbuilder-runhooks | 12 | ||||
| -rwxr-xr-x | pbuilder-user-mode-linux | 2 | ||||
| -rw-r--r-- | pdebuild-user-mode-linux | 2 |
5 files changed, 18 insertions, 18 deletions
diff --git a/pbuilder-loadconfig b/pbuilder-loadconfig index b5942dd..5dd09fd 100644 --- a/pbuilder-loadconfig +++ b/pbuilder-loadconfig @@ -21,6 +21,6 @@ for RCFILE in /usr/share/pbuilder/pbuilderrc /etc/pbuilderrc ${HOME}/.pbuilderrc if [ -f "$RCFILE" ]; then . "$RCFILE" else - echo "W: $RCFILE does not exist" + echo "W: $RCFILE does not exist" >&2 fi done diff --git a/pbuilder-modules b/pbuilder-modules index 9e39b81..b2c74e4 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -100,23 +100,23 @@ function seems_truly_unmounted() { local mountpoint mountpoint="$1" if ! [ -e "$BUILDPLACE/$mountpoint" ]; then - echo "W: $mountpoint doesn't exist" + echo "W: $mountpoint doesn't exist" >&2 return 1 fi if ! [ -d "$BUILDPLACE/$mountpoint" ]; then - echo "W: $mountpoint isn't a directory" + echo "W: $mountpoint isn't a directory" >&2 return 1 fi if [ -r "$BUILDPLACE/proc/mounts" ] && grep -q "^[^ ]* $mountpoint " "$BUILDPLACE/proc/mounts"; then - echo "W: $mountpoint is mounted according to build place's /proc/mounts" + echo "W: $mountpoint is mounted according to build place's /proc/mounts" >&2 return 1 fi if [ -r "/proc/mounts" ] && grep -q "^[^ ]* $BUILDPLACE/$mountpoint " "/proc/mounts"; then - echo "W: $mountpoint is mounted according to system's /proc/mounts" + echo "W: $mountpoint is mounted according to system's /proc/mounts" >&2 return 1 fi if ! is_empty_dir "$BUILDPLACE/$mountpoint"; then - echo "W: $mountpoint not empty" + echo "W: $mountpoint not empty" >&2 return 1 fi return 0 @@ -131,7 +131,7 @@ function umount_one () { echo " -> unmounting $1 filesystem" local UMOUNT_OUTPUT if ! UMOUNT_OUTPUT="$(LC_ALL=C umount "$BUILDPLACE/$1" 2>&1)"; then - echo "W: Could not unmount $1: $UMOUNT_OUTPUT" + echo "W: Could not unmount $1: $UMOUNT_OUTPUT" >&2 local ignore_umount_error="no" case $UMOUNT_OUTPUT in "umount: "*": not found"|"umount:"*": not mounted") @@ -139,7 +139,7 @@ function umount_one () { if seems_truly_unmounted "$1"; then ignore_umount_error="yes" else - echo "W: Tried ignoring error in unmount, but sanity check failed: $1 might still be mounted" + echo "W: Tried ignoring error in unmount, but sanity check failed: $1 might still be mounted" >&2 fi ;; *) @@ -147,7 +147,7 @@ function umount_one () { ;; esac if [ "$ignore_umount_error" != "yes" ]; then - echo "W: Retrying to unmount $1 in 5s" + echo "W: Retrying to unmount $1 in 5s" >&2 sleep 5s while ! umount "$BUILDPLACE/$1"; do sleep 5s @@ -166,7 +166,7 @@ EOF chroot "$BUILDPLACE" bin/sh done else - echo "W: Ignored error in unmount" + echo "W: Ignored error in unmount" >&2 fi fi } diff --git a/pbuilder-runhooks b/pbuilder-runhooks index a1882a7..edec9fd 100644 --- a/pbuilder-runhooks +++ b/pbuilder-runhooks @@ -124,7 +124,7 @@ function loadhooks () { if [ -d "$HOOKDIR" ]; then mkdir -p "$BUILDPLACE/$hooks" if ! cp -a "$HOOKDIR/"* "$BUILDPLACE/$hooks"; then - echo "W: no hooks found on the hookdir" + echo "W: no hooks found on the hookdir" >&2 fi fi } @@ -163,13 +163,13 @@ function executehooks () { for fn in "$BUILDPLACE/$hooks/$prefix"[0-9][0-9]* ; do case "$fn" in "$BUILDPLACE/$hooks/$prefix"'[0-9][0-9]*') - echo "W: no hooks of type ${prefix} found -- ignoring" + echo "W: no hooks of type ${prefix} found -- ignoring" >&2 ;; *~) - echo "W: skipping an editor backup file $fn" + echo "W: skipping an editor backup file $fn" >&2 ;; *.bak) - echo "W: skipping a backup file $fn" + echo "W: skipping a backup file $fn" >&2 ;; *) if [ -x "$fn" ]; then @@ -178,10 +178,10 @@ function executehooks () { else if [ -f "$fn" ]; then filetype=$(basename "$fn" ) - echo "W: execute priv not set on file $filetype, not executing." + echo "W: execute priv not set on file $filetype, not executing." >&2 else # Should it reach here ? This case should be caught in the above case. - echo "W: no hooks of type ${prefix} found -- internal error in logic" + echo "W: no hooks of type ${prefix} found -- internal error in logic" >&2 fi fi ;; diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux index 351db60..3107faa 100755 --- a/pbuilder-user-mode-linux +++ b/pbuilder-user-mode-linux @@ -150,7 +150,7 @@ EOF chmod a+x ${INSIDE_PBUILDER} if [ $( id -u ) = 0 ]; then - echo "W: You are uid=0. Don't run UML as uid=0, it's not supported." + echo "W: You are uid=0. Don't run UML as uid=0, it's not supported." >&2 fi echo Invoking: "linux mem=${UML_MEM} eth0=${MY_ETH0} con0=fd:0,fd:1 con=pty root=/dev/root rootflags=/ rootfstype=hostfs ubd1=${PBUILDER_COW}${PBUILDER_UML_IMAGE} init=${INSIDE_PBUILDER} rw" diff --git a/pdebuild-user-mode-linux b/pdebuild-user-mode-linux index 02a43fe..62f0ab9 100644 --- a/pdebuild-user-mode-linux +++ b/pdebuild-user-mode-linux @@ -44,7 +44,7 @@ if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' ]; then pbuilder-user-mode-linux execute "$@" --bindmounts $(readlink -f ..) /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}" else if ! dpkg-checkbuilddeps -B; then - echo "W: Unmet build-dependency in source" + echo "W: Unmet build-dependency in source" >&2 fi echo "dpkg-buildpackage -S -us -uc -r${BUILDSOURCEROOTCMD} $DEBBUILDOPTS" | /bin/bash pbuilder-user-mode-linux build "$@" --buildresult "${UML_BUILDRESULT}" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc |