Launchpad itself

Merge lp:~mars/launchpad/activate-xvfb-error-log into lp:launchpad

  1. activate-xvfb-error-log
  2. Merge into devel
Proposed by Māris Fogels on 2010-07-28
Status: Merged
Approved by: Jelmer Vernooij on 2010-07-28
Approved revision: no longer in the source branch.
Merged at revision: 11245
Proposed branch: lp:~mars/launchpad/activate-xvfb-error-log
Merge into: lp:launchpad
Diff against target: 14 lines (+2/-2)
1 file modified
test_on_merge.py (+2/-2)
To merge this branch: bzr merge lp:~mars/launchpad/activate-xvfb-error-log
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) code 2010-07-28 Approve on 2010-07-28
Review via email: mp+31154@code.launchpad.net

Commit Message

Activate the Xvfb error log and clarify the server program arguments.

Description of the Change

Hi,

This branch activates the error log for the Xvfb server. Without this xvfb will toss all of its startup errors to /dev/null, making it impossible to diagnose startup problems.

I also rewrote the '-s' argument to --long-form for clarity. I'm the only person that reads this stuff regularly, so this should help other maintainers in future.

This patch has been tested locally and on buildbot.

Maris

To post a comment you must log in.
Jelmer Vernooij (jelmer) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test_on_merge.py'
2--- test_on_merge.py 2010-04-28 20:18:48 +0000
3+++ test_on_merge.py 2010-07-28 14:36:20 +0000
4@@ -138,8 +138,8 @@
5 os.chdir(here)
6 cmd = [
7 'xvfb-run',
8- '-s',
9- "'-screen 0 1024x768x24'",
10+ "--error-file=/var/tmp/xvfb-errors.log",
11+ "--server-args='-screen 0 1024x768x24'",
12 os.path.join(here, 'bin', 'test')] + sys.argv[1:]
13 command_line = ' '.join(cmd)
14 print command_line