git://git.jankratochvil.net
/
youtube-dl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the dev version in Makefile
[youtube-dl.git]
/
youtube-dl
diff --git
a/youtube-dl
b/youtube-dl
index
a1d1e2e
..
a5af555
100755
(executable)
--- a/
youtube-dl
+++ b/
youtube-dl
@@
-4045,7
+4045,7
@@
def gen_extractors():
GenericIE()
]
GenericIE()
]
-def main():
+def
_real_
main():
parser, opts, args = parseOpts()
# Open appropriate CookieJar
parser, opts, args = parseOpts()
# Open appropriate CookieJar
@@
-4205,10
+4205,9
@@
def main():
sys.exit(retcode)
sys.exit(retcode)
-
-if __name__ == '__main__':
+def main():
try:
try:
- main()
+
_real_
main()
except DownloadError:
sys.exit(1)
except SameFileError:
except DownloadError:
sys.exit(1)
except SameFileError:
@@
-4216,4
+4215,7
@@
if __name__ == '__main__':
except KeyboardInterrupt:
sys.exit(u'\nERROR: Interrupted by user')
except KeyboardInterrupt:
sys.exit(u'\nERROR: Interrupted by user')
+if __name__ == '__main__':
+ main()
+
# vim: set ts=4 sw=4 sts=4 noet ai si filetype=python:
# vim: set ts=4 sw=4 sts=4 noet ai si filetype=python: