projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4823: Another merge conflict test.
[arvados.git]
/
sdk
/
python
/
bin
/
arv-get
diff --git
a/sdk/python/bin/arv-get
b/sdk/python/bin/arv-get
index 272fa84a430f4c8c54f5d8d33a75b13f7525a81e..2451416dae38da1932f22fb7c6599b8a82e55110 100755
(executable)
--- a/
sdk/python/bin/arv-get
+++ b/
sdk/python/bin/arv-get
@@
-216,7
+216,7
@@
for s,f,outfilename in todo:
sys.stderr.write("%s %s/%s\n"
% (digestor.hexdigest(), s.name(), f.name()))
except KeyboardInterrupt:
sys.stderr.write("%s %s/%s\n"
% (digestor.hexdigest(), s.name(), f.name()))
except KeyboardInterrupt:
- if outfile and outfile != '/dev/stdout':
+ if outfile and outfile
name
!= '/dev/stdout':
os.unlink(outfilename)
break
os.unlink(outfilename)
break