Author: adam-guest
Date: 2008-05-17 10:01:10 +0000 (Sat, 17 May 2008)
New Revision: 1449
Modified:
trunk/debian/changelog
trunk/scripts/mergechanges.sh
Log:
mergechanges: Send error output to stderr rather than stdout
(Closes: #481583)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-05-15 17:33:36 UTC (rev 1448)
+++ trunk/debian/changelog 2008-05-17 10:01:10 UTC (rev 1449)
@@ -29,6 +29,8 @@
(Closes: #479569)
* dget: Mention in the manpage that dget supports udebs so long as an
appropriate packages file is available to apt (Closes: #480461)
+ * mergechanges: Send error output to stderr rather than stdout
+ (Closes: #481583)
* scripts/Makefile: Run podchecker(1) before building pod-generated
manpages to avoid the generated file containing a "POD errors" section
Modified: trunk/scripts/mergechanges.sh
===================================================================
--- trunk/scripts/mergechanges.sh 2008-05-15 17:33:36 UTC (rev 1448)
+++ trunk/scripts/mergechanges.sh 2008-05-17 10:01:10 UTC (rev 1449)
@@ -110,29 +110,29 @@
# Sanity check #2: Versions must match
if test $(echo "${VERSION}" | wc -l) -ne 1; then
- echo "ERROR: Version numbers do not match:"
- grep "^Version: [0-9]" "$@"
+ echo "ERROR: Version numbers do not match:" >&2
+ grep "^Version: [0-9]" "$@" >&2
exit 1
fi
# Sanity check #3: Sources must match
if test $(echo "${SOURCE}" | wc -l) -ne 1; then
- echo "Error: Source packages do not match:"
- grep "^Source: " "$@"
+ echo "Error: Source packages do not match:" >&2
+ grep "^Source: " "$@" >&2
exit 1
fi
# Sanity check #4: Description for same binary must match
if test $(echo "${DESCRIPTIONS}" | sed -e 's/ \+- .*$//' | uniq -d | wc -l)
-ne 0; then
- echo "Error: Descriptions do not match:"
- echo "${DESCRIPTIONS}"
+ echo "Error: Descriptions do not match:" >&2
+ echo "${DESCRIPTIONS}" >&2
exit 1
fi
# Sanity check #5: Formats must match
if test $(echo "${FORMATS}" | wc -l) -ne 1; then
- echo "Error: Changes files have different Format fields:"
- grep "^Format: " "$@"
+ echo "Error: Changes files have different Format fields:" >&2
+ grep "^Format: " "$@" >&2
exit 1
fi
@@ -141,16 +141,16 @@
1.7|1.8) # Supported
;;
*)
- echo "Error: Changes files use unknown Format:"
- echo "${FORMATS}"
+ echo "Error: Changes files use unknown Format:" >&2
+ echo "${FORMATS}" >&2
exit 1
;;
esac
# Sanity check #7: Unknown checksum fields
if test -n "${UNSUPCHECKSUMS}"; then
- echo "Error: Unsupported checksum fields:"
- echo "${UNSUPCHECKSUMS}"
+ echo "Error: Unsupported checksum fields:" >&2
+ echo "${UNSUPCHECKSUMS}" >&2
exit 1
fi
--
To unsubscribe, send mail to [EMAIL PROTECTED]
