From 2e89299ecae084115107f0e03403c33b31bd23f3 Mon Sep 17 00:00:00 2001 From: j Date: Sat, 30 May 2020 14:35:09 +0200 Subject: [PATCH 1/2] fix update --- update.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update.py b/update.py index bfa0a019..566d23f9 100755 --- a/update.py +++ b/update.py @@ -316,14 +316,14 @@ if __name__ == "__main__": if exists(path): os.chdir(path) current_branch = get_branch(path) + revno = get_version(path) if repo == 'pandora': pandora_old_revno = revno + current += 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 url = repos[repo]['url'] print('Checking', repo) run('git', 'pull') From 4e952c37461b3bf0e0f0951270596bcfea511fe7 Mon Sep 17 00:00:00 2001 From: j Date: Sat, 30 May 2020 14:36:06 +0200 Subject: [PATCH 2/2] import again --- pandora/user/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora/user/utils.py b/pandora/user/utils.py index 3648b78f..49fa7884 100644 --- a/pandora/user/utils.py +++ b/pandora/user/utils.py @@ -1,4 +1,4 @@ -from django.contrib.gis.geoip2 import GeoIP2, GeoIP2Exception2 +from django.contrib.gis.geoip2 import GeoIP2, GeoIP2Exception import ox