mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-09-13 22:42:29 +03:00
Merge branch 'checkupdate' into 'master'
checkupdates: adjust log level See merge request fdroid/fdroidserver!1635
This commit is contained in:
commit
07d499ce1f
1 changed files with 3 additions and 3 deletions
|
@ -724,7 +724,7 @@ def checkout_appid_branch(appid):
|
||||||
try:
|
try:
|
||||||
git_repo.remotes.origin.fetch(f'{appid}:refs/remotes/origin/{appid}')
|
git_repo.remotes.origin.fetch(f'{appid}:refs/remotes/origin/{appid}')
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logging.warning('"%s" branch not found on origin remote:\n\t%s', appid, e)
|
logging.debug('"%s" branch not found on origin remote:\n\t%s', appid, e)
|
||||||
if appid in git_repo.remotes.origin.refs:
|
if appid in git_repo.remotes.origin.refs:
|
||||||
start_point = f"origin/{appid}"
|
start_point = f"origin/{appid}"
|
||||||
for commit in git_repo.iter_commits(
|
for commit in git_repo.iter_commits(
|
||||||
|
@ -838,12 +838,12 @@ def push_commits(branch_name='checkupdates', verbose=False):
|
||||||
if progress:
|
if progress:
|
||||||
for line in progress.other_lines:
|
for line in progress.other_lines:
|
||||||
if line.startswith('remote:'):
|
if line.startswith('remote:'):
|
||||||
logging.debug(line)
|
logging.info(line)
|
||||||
raise FDroidException(
|
raise FDroidException(
|
||||||
f'{remote.url} push failed: {pushinfo.flags} {pushinfo.summary}'
|
f'{remote.url} push failed: {pushinfo.flags} {pushinfo.summary}'
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
logging.debug(remote.url + ': ' + pushinfo.summary)
|
logging.info(remote.url + ': ' + pushinfo.summary)
|
||||||
|
|
||||||
|
|
||||||
def prune_empty_appid_branches(git_repo=None, main_branch='main'):
|
def prune_empty_appid_branches(git_repo=None, main_branch='main'):
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue