diff options
author | Conley Owens <cco3@android.com> | 2012-10-09 14:29:46 -0700 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-10-09 14:29:46 -0700 |
commit | 3a6cd4200e42fbb5a21b3fb8d3c9738c0320cc63 (patch) | |
tree | 68ae5094d6530453887fb35a73fd5fa55f55a034 /subcmds/forall.py | |
parent | 25f17682ca4ecd8acc887462d4bebc7c429cf110 (diff) | |
parent | 8a68ff96057ec58e524a3e41a2d8dca7b5d016bc (diff) | |
download | git-repo-3a6cd4200e42fbb5a21b3fb8d3c9738c0320cc63.tar.gz |
Merge "Coding style cleanup"
Diffstat (limited to 'subcmds/forall.py')
-rw-r--r-- | subcmds/forall.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/subcmds/forall.py b/subcmds/forall.py index 9436f4e5..76a02688 100644 --- a/subcmds/forall.py +++ b/subcmds/forall.py | |||
@@ -208,7 +208,6 @@ terminal and are not redirected. | |||
208 | return self.fd.fileno() | 208 | return self.fd.fileno() |
209 | 209 | ||
210 | empty = True | 210 | empty = True |
211 | didout = False | ||
212 | errbuf = '' | 211 | errbuf = '' |
213 | 212 | ||
214 | p.stdin.close() | 213 | p.stdin.close() |
@@ -220,7 +219,7 @@ terminal and are not redirected. | |||
220 | fcntl.fcntl(s.fd, fcntl.F_SETFL, flags | os.O_NONBLOCK) | 219 | fcntl.fcntl(s.fd, fcntl.F_SETFL, flags | os.O_NONBLOCK) |
221 | 220 | ||
222 | while s_in: | 221 | while s_in: |
223 | in_ready, out_ready, err_ready = select.select(s_in, [], []) | 222 | in_ready, _out_ready, _err_ready = select.select(s_in, [], []) |
224 | for s in in_ready: | 223 | for s in in_ready: |
225 | buf = s.fd.read(4096) | 224 | buf = s.fd.read(4096) |
226 | if not buf: | 225 | if not buf: |
@@ -229,9 +228,7 @@ terminal and are not redirected. | |||
229 | continue | 228 | continue |
230 | 229 | ||
231 | if not opt.verbose: | 230 | if not opt.verbose: |
232 | if s.fd == p.stdout: | 231 | if s.fd != p.stdout: |
233 | didout = True | ||
234 | else: | ||
235 | errbuf += buf | 232 | errbuf += buf |
236 | continue | 233 | continue |
237 | 234 | ||