mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-21 23:21:59 +00:00
Merge pull request #7583 from ClickHouse/blinkov-patch-14
[make_changelog] avoid except without specifying class
This commit is contained in:
commit
7e16805437
@ -35,7 +35,7 @@ def http_get_json(url, token, max_retries, retry_timeout):
|
|||||||
logging.warning(msg)
|
logging.warning(msg)
|
||||||
time.sleep(retry_timeout)
|
time.sleep(retry_timeout)
|
||||||
continue
|
continue
|
||||||
except:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
raise Exception(msg)
|
raise Exception(msg)
|
||||||
@ -60,7 +60,7 @@ def get_merge_base(first, second, project_root):
|
|||||||
sha = tuple(filter(len, text.split()))[0]
|
sha = tuple(filter(len, text.split()))[0]
|
||||||
check_sha(sha)
|
check_sha(sha)
|
||||||
return sha
|
return sha
|
||||||
except:
|
except Exception:
|
||||||
logging.error('Cannot find merge base for %s and %s', first, second)
|
logging.error('Cannot find merge base for %s and %s', first, second)
|
||||||
raise
|
raise
|
||||||
|
|
||||||
@ -198,7 +198,7 @@ def process_unknown_commits(commits, commits_info, users):
|
|||||||
# First, try get name from github user
|
# First, try get name from github user
|
||||||
try:
|
try:
|
||||||
name = users[login]['name']
|
name = users[login]['name']
|
||||||
except:
|
except KeyError:
|
||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
login = 'Unknown'
|
login = 'Unknown'
|
||||||
@ -207,7 +207,7 @@ def process_unknown_commits(commits, commits_info, users):
|
|||||||
if not name:
|
if not name:
|
||||||
try:
|
try:
|
||||||
name = info['commit']['author']['name']
|
name = info['commit']['author']['name']
|
||||||
except:
|
except KeyError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
author = '[{}]({})'.format(name or login, info['author']['html_url'])
|
author = '[{}]({})'.format(name or login, info['author']['html_url'])
|
||||||
|
Loading…
Reference in New Issue
Block a user