diff --git a/fabfile.py b/fabfile.py index b47ec41f2ccb193757c8589c89bbf7b7e3989c28..89795bfc729c5f6b9ca12a08bd8949d5f2da3f79 100644 --- a/fabfile.py +++ b/fabfile.py @@ -36,6 +36,7 @@ def check_tag(tag, path): with cd(path): run('git pull origin master') + run('git fetch --tags') result = run('git tag') if tag not in result.split("\n"): abort("no remote tag %s" % tag) diff --git a/helios/views.py b/helios/views.py index 007b40f3843b8a47d76ad4e960f38bca5510c3d5..f47b8714d01d8c93a2de94bab307491988bf865d 100644 --- a/helios/views.py +++ b/helios/views.py @@ -634,7 +634,8 @@ def voter_delete(request, election, voter_uuid): - election is not frozen or - election is open reg """ - if not (election.frozen_at or election.openreg): + # if election is frozen and has closed registration + if election.frozen_at and (not election.openreg): raise PermissionDenied() if election.encrypted_tally: