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

Compare commits

base: 0x2620:88f0a11612e83a004706dfe69acedcdd91a0e056
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:4e952c37461b3bf0e0f0951270596bcfea511fe7
Branches Tags
0x2620:master
0x2620:stable

2 commits
88f0a11612 ... 4e952c3746

Author SHA1 Message Date
j
4e952c3746 import again 2020-05-30 14:36:06 +02:00
j
2e89299eca fix update 2020-05-30 14:35:09 +02:00
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pandora/user/utils.py
View file

@ -1,4 +1,4 @@
from django.contrib.gis.geoip2 import GeoIP2, GeoIP2Exception2 from django.contrib.gis.geoip2 import GeoIP2, GeoIP2Exception
import ox import ox

4
update.py
View file

@ -316,14 +316,14 @@ 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)
revno = get_version(path)
if repo == 'pandora': if repo == 'pandora':
pandora_old_revno = revno pandora_old_revno = revno
current += revno
if current_branch != branch: if current_branch != branch:
run('git', 'remote', 'set-branches', 'origin', '*') run('git', 'remote', 'set-branches', 'origin', '*')
run('git', 'fetch', 'origin') run('git', 'fetch', 'origin')
run('git', 'checkout', branch) run('git', 'checkout', branch)
revno = get_version(path)
current += revno
url = repos[repo]['url'] url = repos[repo]['url']
print('Checking', repo) print('Checking', repo)
run('git', 'pull') run('git', 'pull')