xorg: Changes to 'ubuntu'
0 files changed
New commits:
commit 4985ef0e33b6b1759dc151b68bcc9604ee33573e
Author: Bryce Harrington <bryce@canonical.com>
Date: Wed Dec 1 19:34:42 2010 -0800
Revert "Avoid letting client apps fill up .xsession-errors"
This reverts commit 46bcf575298d3c70a4eb702a5a34a03c899c1dca.
diff --git a/debian/changelog b/debian/changelog
index 2c1ed6a..8dd4974 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,6 @@ xorg (1:7.5+6ubuntu3) UNRELEASED; urgency=low
* debian/local/Failsafe/failsafeXinit:
+ Fix variable escaping so shows file name for debugging tarball
(LP: #596819)
- * debian/local/Xsession:
- + Limit size of .xsession-errors so client apps don't fill it up
- (LP: #589275)
xorg (1:7.5+6ubuntu3) maverick; urgency=low
diff --git a/debian/local/Xsession b/debian/local/Xsession
index e1a353b..6b071c7 100644
--- a/debian/local/Xsession
+++ b/debian/local/Xsession
@@ -80,8 +80,7 @@ if [ "`stat -c%s \"$ERRFILE\"`" -gt 500000 ]; then
tail -c 500000 "$ERRFILE" > "$T" && mv -f "$T" "$ERRFILE" || rm -f "$T"
fi
-# prevent wayward client apps to fill disk with error messages
-exec 2>&1 | head -c 5000000 >> "$ERRFILE"
+exec >>"$ERRFILE" 2>&1
echo "$PROGNAME: X session started for $LOGNAME at $(date)"
commit 46bcf575298d3c70a4eb702a5a34a03c899c1dca
Author: Bryce Harrington <bryce@canonical.com>
Date: Wed Dec 1 19:25:05 2010 -0800
Avoid letting client apps fill up .xsession-errors
diff --git a/debian/changelog b/debian/changelog
index 8dd4974..2c1ed6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ xorg (1:7.5+6ubuntu3) UNRELEASED; urgency=low
* debian/local/Failsafe/failsafeXinit:
+ Fix variable escaping so shows file name for debugging tarball
(LP: #596819)
+ * debian/local/Xsession:
+ + Limit size of .xsession-errors so client apps don't fill it up
+ (LP: #589275)
xorg (1:7.5+6ubuntu3) maverick; urgency=low
diff --git a/debian/local/Xsession b/debian/local/Xsession
index 6b071c7..e1a353b 100644
--- a/debian/local/Xsession
+++ b/debian/local/Xsession
@@ -80,7 +80,8 @@ if [ "`stat -c%s \"$ERRFILE\"`" -gt 500000 ]; then
tail -c 500000 "$ERRFILE" > "$T" && mv -f "$T" "$ERRFILE" || rm -f "$T"
fi
-exec >>"$ERRFILE" 2>&1
+# prevent wayward client apps to fill disk with error messages
+exec 2>&1 | head -c 5000000 >> "$ERRFILE"
echo "$PROGNAME: X session started for $LOGNAME at $(date)"
Reply to: