X Strike Force XFree86 SVN commit: r1102 - trunk/debian
Author: branden
Date: 2004-02-23 17:23:38 -0500 (Mon, 23 Feb 2004)
New Revision: 1102
Modified:
trunk/debian/changelog
trunk/debian/xserver-xfree86.bug
Log:
Enhance bug-reporting assistance script for XFree86 X server packages.
+ Report on state of X server symlink and XF86Config-4 file with respect
to corresponding roster and checksum files.
+ Report failure of various tests (for existence of XF86Config-4 file,
for availability of lspci command, and so forth); this makes it easier
to distinguish these diagnostics from a report whose submitter elided
the information.
+ Show most recently modified XFree86 X server log file instead of
hard-coding "XFree86.0.log".
+ Add $Id$ keyword and set svn:keywords property to "Id".
+ Add Vim modeline.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-02-23 07:02:03 UTC (rev 1101)
+++ trunk/debian/changelog 2004-02-23 22:23:38 UTC (rev 1102)
@@ -109,8 +109,21 @@
Cameron!).
- debian/local/FAQ
- -- Branden Robinson <branden@debian.org> Mon, 23 Feb 2004 01:58:11 -0500
+ * Enhance bug-reporting assistance script for XFree86 X server packages.
+ + Report on state of X server symlink and XF86Config-4 file with respect
+ to corresponding roster and checksum files.
+ + Report failure of various tests (for existence of XF86Config-4 file,
+ for availability of lspci command, and so forth); this makes it easier
+ to distinguish these diagnostics from a report whose submitter elided
+ the information.
+ + Show most recently modified XFree86 X server log file instead of
+ hard-coding "XFree86.0.log".
+ + Add $Id$ keyword and set svn:keywords property to "Id".
+ + Add Vim modeline.
+ - debian/xserver-xfree86.bug
+ -- Branden Robinson <branden@debian.org> Mon, 23 Feb 2004 17:22:22 -0500
+
xfree86 (4.3.0-2) unstable; urgency=low
* The "It's like I have a shotgun in my mouth, I've got my finger on the
Modified: trunk/debian/xserver-xfree86.bug
===================================================================
--- trunk/debian/xserver-xfree86.bug 2004-02-23 07:02:03 UTC (rev 1101)
+++ trunk/debian/xserver-xfree86.bug 2004-02-23 22:23:38 UTC (rev 1102)
@@ -1,21 +1,105 @@
#!/bin/sh
-PATH=/sbin:$PATH
+# $Id$
+PATH="/sbin:$PATH"
+CONFIG_DIR=/etc/X11
+SERVER_SYMLINK="$CONFIG_DIR/X"
+XF86CONFIG="$CONFIG_DIR/XF86Config-4"
+CONFIG_AUX_DIR=/var/lib/xfree86
+SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.md5sum"
+SERVER_SYMLINK_ROSTER="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.roster"
+XF86CONFIG_CHECKSUM="$CONFIG_AUX_DIR/${XF86CONFIG##*/}.md5sum"
+XF86CONFIG_ROSTER="$CONFIG_AUX_DIR/${XF86CONFIG##*/}.roster"
+
+if [ -e "$SERVER_SYMLINK_ROSTER" ]; then
+ printf "Contents of $SERVER_SYMLINK_ROSTER:\n" >&3
+ cat "$SERVER_SYMLINK_ROSTER" >&3
+ printf "\n" >&3
+else
+ printf "$SERVER_SYMLINK_ROSTER does not exist.\n" >&3
+fi
+
+if [ -e "$SERVER_SYMLINK" ]; then
+ ls -dl "$SERVER_SYMLINK" >&3
+ ls -dl "$(readlink "$SERVER_SYMLINK")" >&3
+ if [ -e "$SERVER_SYMLINK_CHECKSUM" ]; then
+ if [ "$(readlink "$SERVER_SYMLINK" | md5sum)" = \
+ "$(cat "$SERVER_SYMLINK_CHECKSUM")" ]; then
+ printf "$SERVER_SYMLINK target unchanged from checksum in" \
+ "$SERVER_SYMLINK_CHECKSUM.\n" >&3
+ else
+ printf "$SERVER_SYMLINK target does not match checksum in" \
+ "$SERVER_SYMLINK_CHECKSUM.\n" >&3
+ fi
+ else
+ printf "$SERVER_SYMLINK_CHECKSUM does not exist.\n" >&3
+ fi
+else
+ printf "$SERVER_SYMLINK does not exist.\n" >&3
+fi
+
+if [ ! -L "$SERVER_SYMLINK" ]; then
+ printf "$SERVER_SYMLINK is not a symlink.\n" >&3
+fi
+
+if [ ! -x "$SERVER_SYMLINK" ]; then
+ printf "$SERVER_SYMLINK is not executable.\n" >&3
+fi
+
+if [ -e "$XF86CONFIG_ROSTER" ]; then
+ printf "Contents of $XF86CONFIG_ROSTER:\n" >&3
+ cat "$XF86CONFIG_ROSTER" >&3
+ printf "\n" >&3
+else
+ printf "$XF86CONFIG_ROSTER does not exist.\n" >&3
+fi
+
if which lspci > /dev/null 2>&1; then
- LC_ALL=C lspci | grep 'VGA compatible controller:' >&3
- LC_ALL=C lspci -n | grep 'Class 0300:' >&3
- printf "\n" >&3
+ LC_ALL=C lspci | grep 'VGA compatible controller:' >&3
+ LC_ALL=C lspci -n | grep 'Class 0300:' >&3
+ printf "\n" >&3
+else
+ printf "The lspci command was not found; not including PCI data.\n" >&3
fi
-if [ -e /etc/X11/XF86Config-4 ]; then
- cat /etc/X11/XF86Config-4 >&3
- printf "\n" >&3
+if [ -e "$XF86CONFIG" ]; then
+ ls -dl "$XF86CONFIG" >&3
+ printf "Contents of $XF86CONFIG:\n" >&3
+ cat "$XF86CONFIG" >&3
+ printf "\n" >&3
+ if [ -e "$XF86CONFIG_CHECKSUM" ]; then
+ if [ "$(md5sum "$XF86CONFIG")" = "$(cat "$XF86CONFIG_CHECKSUM")" ]; then
+ printf "$XF86CONFIG unchanged from checksum in" \
+ "$XF86CONFIG_CHECKSUM.\n" >&3
+ else
+ printf "$XF86CONFIG does not match checksum in" \
+ "$XF86CONFIG_CHECKSUM.\n" >&3
+ fi
+ else
+ printf "$XF86CONFIG_CHECKSUM does not exist.\n" >&3
+ fi
+else
+ printf "$XF86CONFIG does not exist.\n" >&3
fi
-if [ -e /var/log/XFree86.0.log ]; then
- cat /var/log/XFree86.0.log >&3
- printf "\n" >&3
+XFREE86_LOGS=$(ls -drt /var/log/XFree86.*.log 2>/dev/null)
+
+if [ -n "$XFREE86_LOGS" ]; then
+ for LOG in $XFREE86_LOGS; do
+ if [ -f "$LOG" ]; then
+ printf "Contents of most recent XFree86 X server log file\n" >&3
+ printf "%s:\n" "$LOG" >&3
+ cat "$LOG" >&3
+ printf "\n" >&3
+ # the log files are large; only show the most recent
+ break
+ fi
+ done
+ printf "XFree86 X server log files on system:\n" >&3
+ ls -dlrt /var/log/XFree86.*.log >&3 2>/dev/null
+else
+ printf "No XFree86 X server log files found.\n" >&3
fi
-ls -d -l /var/log/XFree86.*.log >&3 2> /dev/null
+# vim:set ai et sts=4 sw=4 tw=0:
Property changes on: trunk/debian/xserver-xfree86.bug
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: