Merge lp:~john-peterson/calibre/error into lp:calibre

Proposed by John Peterson
Status: Needs review
Proposed branch: lp:~john-peterson/calibre/error
Merge into: lp:calibre
Diff against target: 16 lines (+1/-5)
1 file modified
setup/check.py (+1/-5)
To merge this branch: bzr merge lp:~john-peterson/calibre/error
Reviewer Review Type Date Requested Status
Kovid Goyal Pending
Review via email: mp+147652@code.launchpad.net

Description of the change

To post a comment you must log in.

Unmerged revisions

14269. By John Peterson

Print error if `coffee` is missing rather than open the editor

Placing `check_call` on a single line so that the call is visible in 'Traceback'

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup/check.py'
2--- setup/check.py 2012-12-28 02:37:53 +0000
3+++ setup/check.py 2013-02-11 13:21:25 +0000
4@@ -95,11 +95,7 @@
5 errors = True
6 self.report_errors(w)
7 else:
8- try:
9- subprocess.check_call(['coffee', '-c', '-p', f],
10- stdout=open(os.devnull, 'wb'))
11- except:
12- errors = True
13+ subprocess.check_call(['coffee', '-c', '-p', f], stdout=open(os.devnull, 'wb'))
14 if errors:
15 cPickle.dump(cache, open(self.CACHE, 'wb'), -1)
16 subprocess.call(['gvim', '-S',

Subscribers

People subscribed via source and target branches