[update] Do not restart into versions without `--update-to`

pull/7390/head
pukkandan 2 years ago
parent 424f3bf033
commit 02948a17d9
No known key found for this signature in database
GPG Key ID: 7EEE9E1E817D0A39

@ -149,7 +149,7 @@ class Updater:
f'You are switching to an {self.ydl._format_err("unofficial", "red")} executable ' f'You are switching to an {self.ydl._format_err("unofficial", "red")} executable '
f'from {self.ydl._format_err(self._target_repo, self.ydl.Styles.EMPHASIS)}. ' f'from {self.ydl._format_err(self._target_repo, self.ydl.Styles.EMPHASIS)}. '
f'Run {self.ydl._format_err("at your own risk", "light red")}') f'Run {self.ydl._format_err("at your own risk", "light red")}')
self.restart = self._blocked_restart self._block_restart('Automatically restarting into custom builds is disabled for security reasons')
else: else:
self._target_repo = UPDATE_SOURCES.get(self.target_channel) self._target_repo = UPDATE_SOURCES.get(self.target_channel)
if not self._target_repo: if not self._target_repo:
@ -294,6 +294,7 @@ class Updater:
if (_VERSION_RE.fullmatch(self.target_tag[5:]) if (_VERSION_RE.fullmatch(self.target_tag[5:])
and version_tuple(self.target_tag[5:]) < (2023, 3, 2)): and version_tuple(self.target_tag[5:]) < (2023, 3, 2)):
self.ydl.report_warning('You are downgrading to a version without --update-to') self.ydl.report_warning('You are downgrading to a version without --update-to')
self._block_restart('Cannot automatically restart to a version without --update-to')
directory = os.path.dirname(self.filename) directory = os.path.dirname(self.filename)
if not os.access(self.filename, os.W_OK): if not os.access(self.filename, os.W_OK):
@ -381,11 +382,11 @@ class Updater:
_, _, returncode = Popen.run(self.cmd) _, _, returncode = Popen.run(self.cmd)
return returncode return returncode
def _blocked_restart(self): def _block_restart(self, msg):
self._report_error( def wrapper():
'Automatically restarting into custom builds is disabled for security reasons. ' self._report_error(f'{msg}. Restart yt-dlp to use the updated version', expected=True)
'Restart yt-dlp to use the updated version', expected=True)
return self.ydl._download_retcode return self.ydl._download_retcode
self.restart = wrapper
def run_update(ydl): def run_update(ydl):

Loading…
Cancel
Save