projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e5871c6
)
[update] Fix youtube-dl.exe updating from arbitrary directory (Closes #2718)
author
Sergey M․
<dstftw@gmail.com>
Sun, 22 May 2016 04:06:45 +0000
(10:06 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Sun, 22 May 2016 04:06:45 +0000
(10:06 +0600)
youtube_dl/update.py
patch
|
blob
|
history
diff --git
a/youtube_dl/update.py
b/youtube_dl/update.py
index 676ebe1c42d1d6b54eb50bfc3f087e6fee8e20f0..ebce9666a21465b53b93ccd0bd263b29349720a0 100644
(file)
--- a/
youtube_dl/update.py
+++ b/
youtube_dl/update.py
@@
-83,11
+83,8
@@
def update_self(to_screen, verbose, opener):
print_notes(to_screen, versions_info['versions'])
print_notes(to_screen, versions_info['versions'])
- filename = sys.argv[0]
- # Py2EXE: Filename could be different
- if hasattr(sys, 'frozen') and not os.path.isfile(filename):
- if os.path.isfile(filename + '.exe'):
- filename += '.exe'
+ # sys.executable is set to the full pathname of the exe-file for py2exe
+ filename = sys.executable if hasattr(sys, 'frozen') else sys.argv[0]
if not os.access(filename, os.W_OK):
to_screen('ERROR: no write permissions on %s' % filename)
if not os.access(filename, os.W_OK):
to_screen('ERROR: no write permissions on %s' % filename)
@@
-95,7
+92,7
@@
def update_self(to_screen, verbose, opener):
# Py2EXE
if hasattr(sys, 'frozen'):
# Py2EXE
if hasattr(sys, 'frozen'):
- exe =
os.path.abspath(filename)
+ exe =
filename
directory = os.path.dirname(exe)
if not os.access(directory, os.W_OK):
to_screen('ERROR: no write permissions on %s' % directory)
directory = os.path.dirname(exe)
if not os.access(directory, os.W_OK):
to_screen('ERROR: no write permissions on %s' % directory)