X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube-dl;h=e3eb8774caa258ddbaa51323938fbd36c4fc170d;hb=2b35c9ef742bf261078ea10c6c0bba848db1a0df;hp=9766d905e333fb79cc77856b41b6cad4a1cee463;hpb=cb6ff87fbb05e421f77b57a79699c647866ceb09;p=youtube-dl diff --git a/youtube-dl b/youtube-dl index 9766d905e..e3eb8774c 100755 --- a/youtube-dl +++ b/youtube-dl @@ -38,7 +38,7 @@ def rsa_verify(message, signature, key): sys.stderr.write(u'Hi! We changed distribution method and now youtube-dl needs to update itself one more time.\n') sys.stderr.write(u'This will only happen once. Simply press enter to go on. Sorry for the trouble!\n') -sys.stderr.write(u'From now on, get the binaries from http://rg3.github.com/youtube-dl/download.html, not from the git repository.\n\n') +sys.stderr.write(u'From now on, get the binaries from http://rg3.github.io/youtube-dl/download.html, not from the git repository.\n\n') try: raw_input() @@ -47,7 +47,7 @@ except NameError: # Python 3 filename = sys.argv[0] -UPDATE_URL = "http://rg3.github.com/youtube-dl/update/" +UPDATE_URL = "http://rg3.github.io/youtube-dl/update/" VERSION_URL = UPDATE_URL + 'LATEST_VERSION' JSON_URL = UPDATE_URL + 'versions.json' UPDATES_RSA_KEY = (0x9d60ee4d8f805312fdb15a62f87b95bd66177b91df176765d13514a0f1754bcd2057295c5b6f1d35daa6742c3ffc9a82d3e118861c207995a8031e151d863c9927e304576bc80692bc8e094896fcf11b66f3e29e04e3a71e9a11558558acea1840aec37fc396fb6b65dc81a1c4144e03bd1c011de62e3f1357b327d08426fe93, 65537) @@ -64,7 +64,7 @@ if not 'signature' in versions_info: sys.exit(u'ERROR: the versions file is not signed or corrupted. Aborting.') signature = versions_info['signature'] del versions_info['signature'] -if not rsa_verify(json.dumps(versions_info, sort_keys=True), signature, UPDATES_RSA_KEY): +if not rsa_verify(json.dumps(versions_info, sort_keys=True).encode('utf-8'), signature, UPDATES_RSA_KEY): sys.exit(u'ERROR: the versions file signature is invalid. Aborting.') version = versions_info['versions'][versions_info['latest']]