debian/changelog | 9 ++-
debian/xserver-xorg-core.bug.script | 90 ++++++++++++++++++------------------
2 files changed, 53 insertions(+), 46 deletions(-)
New commits:
commit 769b6ff5bc50a30e37a529ac4264c84e9736dbbe
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Sat Aug 25 14:19:23 2007 +0200
Simplify output redirections in the reportbug script
diff --git a/debian/changelog b/debian/changelog
index 2b18add..07a3cc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
xorg-server (2:1.3.99.0-3) unreleased; urgency=low
+ [ David Nusinow ]
* Refactor auto_load_driver patch to allow the same method to be used when
there is no xorg.conf present
* Add 04_auto_load_driver_no_config.diff to use my auto_load_driver method
- when there's no xorg.conf present
+ when there's no xorg.conf present
+
+ [ Brice Goglin ]
+ * Simplify output redirections in the reportbug script,
+ thanks Justin Pryzby, closes: #358390.
- -- David Nusinow <[EMAIL PROTECTED]> Thu, 23 Aug 2007 22:37:41 -0400
+ -- Brice Goglin <[EMAIL PROTECTED]> Sat, 25 Aug 2007 14:18:07 +0200
xorg-server (2:1.3.99.0-2) experimental; urgency=low
diff --git a/debian/xserver-xorg-core.bug.script
b/debian/xserver-xorg-core.bug.script
index d1f471d..739cdd3 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -12,109 +12,111 @@
SERVER_SYMLINK_ROSTER="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.roster"
XORGCONFIG_CHECKSUM="$CONFIG_AUX_DIR/${XORGCONFIG##*/}.md5sum"
XORGCONFIG_ROSTER="$CONFIG_AUX_DIR/${XORGCONFIG##*/}.roster"
+exec >&3
+
if [ -e "$SERVER_SYMLINK_ROSTER" ]; then
- printf "Contents of $SERVER_SYMLINK_ROSTER:\n" >&3
- cat "$SERVER_SYMLINK_ROSTER" >&3
+ printf "Contents of $SERVER_SYMLINK_ROSTER:\n"
+ cat "$SERVER_SYMLINK_ROSTER"
else
- printf "$SERVER_SYMLINK_ROSTER does not exist.\n" >&3
+ printf "$SERVER_SYMLINK_ROSTER does not exist.\n"
fi
-printf "\n" >&3
+printf "\n"
if [ -e "$SERVER_SYMLINK" ]; then
if [ -e "$SERVER_SYMLINK_CHECKSUM" ]; then
if [ "$(readlink "$SERVER_SYMLINK" | md5sum)" = \
"$(cat "$SERVER_SYMLINK_CHECKSUM")" ]; then
printf "%s target unchanged from checksum in %s.\n" \
- "$SERVER_SYMLINK" "$SERVER_SYMLINK_CHECKSUM" >&3
+ "$SERVER_SYMLINK" "$SERVER_SYMLINK_CHECKSUM"
else
printf "%s target does not match checksum in %s.\n" \
- "$SERVER_SYMLINK" "$SERVER_SYMLINK_CHECKSUM" >&3
+ "$SERVER_SYMLINK" "$SERVER_SYMLINK_CHECKSUM"
fi
else
- printf "$SERVER_SYMLINK_CHECKSUM does not exist.\n" >&3
+ printf "$SERVER_SYMLINK_CHECKSUM does not exist.\n"
fi
- printf "\n" >&3
- printf "X server symlink status:\n" >&3
- ls -dl "$SERVER_SYMLINK" >&3
- ls -dl "$(readlink "$SERVER_SYMLINK")" >&3
+ printf "\n"
+ printf "X server symlink status:\n"
+ ls -dl "$SERVER_SYMLINK"
+ ls -dl "$(readlink "$SERVER_SYMLINK")"
else
- printf "$SERVER_SYMLINK does not exist.\n" >&3
+ printf "$SERVER_SYMLINK does not exist.\n"
fi
if ! [ -L "$SERVER_SYMLINK" ]; then
- printf "$SERVER_SYMLINK is not a symlink.\n" >&3
+ printf "$SERVER_SYMLINK is not a symlink.\n"
fi
if ! [ -x "$SERVER_SYMLINK" ]; then
- printf "$SERVER_SYMLINK is not executable.\n" >&3
+ printf "$SERVER_SYMLINK is not executable.\n"
fi
-printf "\n" >&3
+printf "\n"
if [ -e "$XORGCONFIG_ROSTER" ]; then
- printf "Contents of $XORGCONFIG_ROSTER:\n" >&3
- cat "$XORGCONFIG_ROSTER" >&3
+ printf "Contents of $XORGCONFIG_ROSTER:\n"
+ cat "$XORGCONFIG_ROSTER"
else
- printf "$XORGCONFIG_ROSTER does not exist.\n" >&3
+ printf "$XORGCONFIG_ROSTER does not exist.\n"
fi
-printf "\n" >&3
+printf "\n"
if which lspci > /dev/null 2>&1; then
- printf "VGA-compatible devices on PCI bus:\n" >&3
- LC_ALL=C lspci | grep 'VGA compatible controller:' >&3
- LC_ALL=C lspci -n | grep 'Class 0300:' >&3
+ printf "VGA-compatible devices on PCI bus:\n"
+ LC_ALL=C lspci | grep 'VGA compatible controller:'
+ LC_ALL=C lspci -n | grep 'Class 0300:'
else
- printf "The lspci command was not found; not including PCI data.\n" >&3
+ printf "The lspci command was not found; not including PCI data.\n"
fi
-printf "\n" >&3
+printf "\n"
if [ -e "$XORGCONFIG" ]; then
if [ -e "$XORGCONFIG_CHECKSUM" ]; then
if [ "$(md5sum "$XORGCONFIG")" = "$(cat "$XORGCONFIG_CHECKSUM")" ];
then
printf "%s unchanged from checksum in %s.\n" "$XORGCONFIG" \
- "$XORGCONFIG_CHECKSUM" >&3
+ "$XORGCONFIG_CHECKSUM"
else
printf "%s does not match checksum in %s.\n" "$XORGCONFIG" \
- "$XORGCONFIG_CHECKSUM" >&3
+ "$XORGCONFIG_CHECKSUM"
fi
else
- printf "$XORGCONFIG_CHECKSUM does not exist.\n" >&3
+ printf "$XORGCONFIG_CHECKSUM does not exist.\n"
fi
- printf "\n" >&3
- printf "Xorg X server configuration file status:\n" >&3
- ls -dl "$XORGCONFIG" >&3
- printf "\n" >&3
- printf "Contents of $XORGCONFIG:\n" >&3
- iconv -c -t ascii "$XORGCONFIG" >&3
- printf "\n" >&3
+ printf "\n"
+ printf "Xorg X server configuration file status:\n"
+ ls -dl "$XORGCONFIG"
+ printf "\n"
+ printf "Contents of $XORGCONFIG:\n"
+ iconv -c -t ascii "$XORGCONFIG"
+ printf "\n"
else
- printf "$XORGCONFIG does not exist.\n" >&3
+ printf "$XORGCONFIG does not exist.\n"
fi
-printf "\n" >&3
+printf "\n"
XORG_LOGS=$(ls -dt /var/log/Xorg.*.log 2>/dev/null)
if [ -n "$XORG_LOGS" ]; then
- printf "Xorg X server log files on system:\n" >&3
- ls -dlrt /var/log/Xorg.*.log >&3 2>/dev/null
- printf "\n" >&3
+ printf "Xorg X server log files on system:\n"
+ ls -dlrt /var/log/Xorg.*.log 2>/dev/null
+ printf "\n"
for LOG in $XORG_LOGS; do
if [ -f "$LOG" ]; then
- printf "Contents of most recent Xorg X server log file\n" >&3
- printf "%s:\n" "$LOG" >&3
- cat "$LOG" >&3
+ printf "Contents of most recent Xorg X server log file\n"
+ printf "%s:\n" "$LOG"
+ cat "$LOG"
# the log files are large; only show the most recent
break
fi
done
else
- printf "No Xorg X server log files found.\n" >&3
+ printf "No Xorg X server log files found.\n"
fi
-printf "\n" >&3
+printf "\n"
# vim:set ai et sts=4 sw=4 tw=0:
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
