Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
strategy:
fail-fast: False
matrix:
ubuntu: ['ubuntu-20.04', 'ubuntu-22.04']
ubuntu: ['ubuntu-24.04', 'ubuntu-22.04']
name: FCM Tests ${{matrix.ubuntu}}
runs-on: ${{matrix.ubuntu}}
steps:
Expand Down
15 changes: 8 additions & 7 deletions sbin/svnperms.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python2
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
#
Expand All @@ -22,8 +22,8 @@
#

# THIS DISTRIBUTION HAS BEEN MODIFIED.
# Original source downloaded from r1295006 at:
# https://svn.apache.org/viewvc/subversion/trunk/tools/hook-scripts/svnperms.py
# Original source downloaded from r1886358 at:
# https://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/svnperms.py
# This version is modified to allow custom permission message per repository.
# It also fixes the Config.get method.

Expand Down Expand Up @@ -138,7 +138,8 @@ def parse_groups(self, groupsiter):
try:
groupusers.extend(self._group[token[1:]])
except KeyError:
raise Error, "group '%s' not found" % token[1:]
raise Error("group '%s' not found" % \
token[1:])
else:
groupusers.append(token)
self._group[option] = groupusers
Expand Down Expand Up @@ -302,7 +303,7 @@ class MissingArgumentsException(Exception):
def parse_options():
try:
opts, args = my_getopt(sys.argv[1:], "f:s:r:t:R:A:h", ["help"])
except getopt.GetoptError, e:
except getopt.GetoptError as e:
raise Error(e.msg)
class Options: pass
obj = Options()
Expand Down Expand Up @@ -355,11 +356,11 @@ def main():
check_perms(opts.filename, opts.section,
opts.repository, opts.transaction, opts.revision,
opts.author)
except MissingArgumentsException, e:
except MissingArgumentsException as e:
sys.stderr.write("%s\n" % str(e))
sys.stderr.write(USAGE)
sys.exit(1)
except Error, e:
except Error as e:
sys.stderr.write("error: %s\n" % str(e))
sys.exit(1)

Expand Down
Loading