0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

get current revno before switch

Browse source
This commit is contained in:
j 2020-05-30 14:00:08 +02:00
parent 23c7a683a8
commit d82cd9b6a7
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
update.py
View file

@ -297,7 +297,7 @@ if __name__ == "__main__":
]: ]:
run_sql(sql) run_sql(sql)
run(join(base, 'pandora/manage.py'), 'migrate', 'system') run(join(base, 'pandora/manage.py'), 'migrate', 'system')
run(join(base, 'pandora/manage.py'), 'update_geoip')
else: else:
if len(sys.argv) == 1: if len(sys.argv) == 1:
branch = get_branch() branch = get_branch()
@ -316,13 +316,13 @@ if __name__ == "__main__":
if exists(path): if exists(path):
os.chdir(path) os.chdir(path)
current_branch = get_branch(path) current_branch = get_branch(path)
if current_branch != branch:
run('git', 'remote', 'set-branches', 'origin', '*')
run('git', 'fetch', 'origin')
run('git', 'checkout', branch)
revno = get_version(path)
if repo == 'pandora': if repo == 'pandora':
pandora_old_revno = revno pandora_old_revno = revno
if current_branch != branch:
run('git', 'remote', 'set-branches', 'origin', '*')
run('git', 'fetch', 'origin')
run('git', 'checkout', branch)
revno = get_version(path)
current += revno current += revno
url = repos[repo]['url'] url = repos[repo]['url']
print('Checking', repo) print('Checking', repo)