R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

If password was not found in keyring - don't ask for it, just fail with error.

Browse Source
This commit is contained in:
Aleksei Kovura 2017-11-06 11:12:35 +03:00
parent ce0148424a
commit 5b295effdd
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
youtube_dl/__init__.py
View File

@ -155,13 +155,7 @@ def _real_main(argv=None):
domain_name = all_domains.pop()
password = Secret.password_lookup_sync(LIBSECRET_SCHEMA, {"user-name": opts.username, "domain-name": domain_name}, None)
if password is None:
print("Password for domain " + domain_name + " and user name " + opts.username + " not found in the keyring.")
supplied_password = compat_getpass('Type account password and press [Return]: ')
attributes = {"user-name": opts.username, "domain-name": domain_name}
label = "Youtube-dl: " + domain_name + " password"
Secret.password_store_sync(LIBSECRET_SCHEMA, attributes, Secret.COLLECTION_DEFAULT, label, supplied_password, None)
password = Secret.password_lookup_sync(LIBSECRET_SCHEMA, {"user-name": opts.username, "domain-name": domain_name}, None)
opts.password = password
parser.error('Password not found in keyring/wallet')
if opts.username is not None and opts.password is None and opts.keyring is False:
opts.password = compat_getpass('Type account password and press [Return]: ')
if opts.ap_username is not None and opts.ap_password is None: