From d8df43d8e7a2bbd0ad82318b173d00ffe0b55c3b Mon Sep 17 00:00:00 2001 From: Carl George Date: Feb 19 2025 08:13:03 +0000 Subject: Do not auto-request EPEL x.y modules After the EPEL 10.0 mass branching, we discovered that running `fedpkg request-branch epel10.0` would file SCM requests for: - New Branch "epel10.0" for "rpms/" - New Repo for "modules/" - New Branch "epel10.0" for "modules/" The second two are invalid and unwanted. Thankfully Fabio Valentini (@decathorpe) noticed that this was similar to what was happening for ELN a while back, an pointed me to RELEASE_BRANCH_REGEX. This adjust that regex to also accept EPEL minor version branches. Related: #564 Signed-off-by: Carl George --- diff --git a/fedpkg/cli.py b/fedpkg/cli.py index aa57451..33dbd91 100644 --- a/fedpkg/cli.py +++ b/fedpkg/cli.py @@ -46,7 +46,7 @@ from fedpkg.utils import (assert_new_tests_repo, assert_valid_epel_package, get_release_branches, get_stream_branches, is_epel, new_pagure_issue, sl_list_to_dict, verify_sls) -RELEASE_BRANCH_REGEX = r'^(f\d+|el\d+|eln|epel\d+)$' +RELEASE_BRANCH_REGEX = r'^(f\d+|el\d+|eln|epel\d+|epel\d+\.\d+)$' LOCAL_PACKAGE_CONFIG = 'package.cfg' BODHI_TEMPLATE = """\