From b020cbecff9d9a838332a851e9a512bdd30b2b69 Mon Sep 17 00:00:00 2001 From: apb Date: Sun, 8 Jan 2006 10:32:26 +0000 Subject: [PATCH] Oops, missed a few echo >&2 changes in previous commit. --- distrib/sets/syspkgdeps | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/distrib/sets/syspkgdeps b/distrib/sets/syspkgdeps index b546c41abf9c..969e91923d33 100755 --- a/distrib/sets/syspkgdeps +++ b/distrib/sets/syspkgdeps @@ -116,7 +116,7 @@ if [ $? -ne 0 ]; then exit 1 fi -echo "checking for cyclic dependencies" 1>&2 +echo >&2 "${prog}: checking for cyclic dependencies" tsort_errors="$( ${TSORT} < "${SCRATCH}/alldeps" 2>&1 >/dev/null )" @@ -124,16 +124,16 @@ if [ -n "${tsort_errors}" ]; then # Errors from tsort are usually to do with cyclic dependencies. # The most likely underlying cause is that /foo and /foo/bar/baz # are in syspkg A, but /foo/bar is in syspkg B. - echo "${tsort_errors}" 1>&2 - echo "Above messages probably indicate an error in the lists" 1>&2 + echo >&2 "${tsort_errors}" # this is likely to be multiple lines + echo >&2 "${prog}: Above messages probably indicate an error in the lists" exit 1 fi -echo "removing redundant dependencies" 1>&2 +echo >&2 "${prog}: removing redundant dependencies" ${HOST_SH} "${rundir}/culldeps" < "${SCRATCH}/alldeps" if [ $? -ne 0 ]; then - echo "error in culldeps, aborting" 1>&2 + echo >&2 "${prog}: error in culldeps, aborting" exit 1 fi