Merge lp:~jaypipes/glance/bug706636 into lp:~hudson-openstack/glance/trunk

Proposed by Jay Pipes on 2011-01-23
Status: Merged
Approved by: Jay Pipes on 2011-01-23
Approved revision: 48
Merged at revision: 48
Proposed branch: lp:~jaypipes/glance/bug706636
Merge into: lp:~hudson-openstack/glance/trunk
Diff against target: 24 lines (+2/-4)
2 files modified
bin/glance-upload (+1/-1)
run_tests.sh (+1/-3)
To merge this branch: bzr merge lp:~jaypipes/glance/bug706636
Reviewer Review Type Date Requested Status
Soren Hansen (community) Approve on 2011-01-23
Rick Harris (community) 2011-01-23 Approve on 2011-01-23
Review via email: mp+47194@code.launchpad.net

Description of the change

Fixes bug #706636: Make sure pep8 failures will return failure for run_tests.sh

To post a comment you must log in.
Rick Harris (rconradharris) wrote :

lgtm

review: Approve
Soren Hansen (soren) wrote :

Heh.. This looks familiar ;) lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/glance-upload'
2--- bin/glance-upload 2011-01-22 19:42:07 +0000
3+++ bin/glance-upload 2011-01-23 17:30:28 +0000
4@@ -41,7 +41,7 @@
5
6
7 def die(msg):
8- print >>sys.stderr, msg
9+ print >> sys.stderr, msg
10 sys.exit(1)
11
12
13
14=== modified file 'run_tests.sh'
15--- run_tests.sh 2011-01-19 19:22:41 +0000
16+++ run_tests.sh 2011-01-23 17:30:28 +0000
17@@ -71,6 +71,4 @@
18 fi
19 fi
20
21-run_tests
22-
23-pep8 --repeat --show-pep8 --show-source bin/* glance setup.py run_tests.py
24+run_tests && pep8 --repeat --show-pep8 --show-source bin/* glance setup.py run_tests.py || exit 1

Subscribers

People subscribed via source and target branches