From f3b08aa126ef777c491922285bced7f91e6d73d2 Mon Sep 17 00:00:00 2001 From: Sandu Turcan Date: Tue, 30 Apr 2019 14:36:46 -0400 Subject: [PATCH] Future proof path permissions for Mercurial 5.0 --- rhodecode/lib/vcs/backends/hg/repository.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/rhodecode/lib/vcs/backends/hg/repository.py b/rhodecode/lib/vcs/backends/hg/repository.py index ba0aca33..edcb05cd 100644 --- a/rhodecode/lib/vcs/backends/hg/repository.py +++ b/rhodecode/lib/vcs/backends/hg/repository.py @@ -897,11 +897,15 @@ class MercurialRepository(BaseRepository): def read_patterns(suffix): svalue = None - try: - svalue = hgacl.get('narrowhgacl', username + suffix) - except configparser.NoOptionError: + for section, option in [ + ('narrowacl', username + suffix), + ('narrowacl', 'default' + suffix), + ('narrowhgacl', username + suffix), + ('narrowhgacl', 'default' + suffix) + ]: try: - svalue = hgacl.get('narrowhgacl', 'default' + suffix) + svalue = hgacl.get(section, option) + break # stop at the first value we find except configparser.NoOptionError: pass if not svalue: