From fde9d63cb6f513a441619970b3293f11957da36d Mon Sep 17 00:00:00 2001
From: Carl George <carlwgeorge@gmail.com>
Date: Jan 07 2025 21:59:14 +0000
Subject: Clone epel10 branches with clone -B


Running `fedpkg clone -B` relies on the configured branch regex to
determine the branches to clone.  The current regex doesn't match EPEL
branches with more that one digit.  We recently started having epel10
branches, and in the future we'll also have epel10.0, epel10.1, and so
forth.  This adjusts the regex to account for these branch names.

Signed-off-by: Carl George <carlwgeorge@gmail.com>

---

diff --git a/conf/etc/rpkg/fedpkg-stage.conf b/conf/etc/rpkg/fedpkg-stage.conf
index 87d66fe..0884a42 100644
--- a/conf/etc/rpkg/fedpkg-stage.conf
+++ b/conf/etc/rpkg/fedpkg-stage.conf
@@ -4,7 +4,7 @@ lookasidehash = sha512
 lookaside_cgi = https://src.stg.fedoraproject.org/repo/pkgs/upload.cgi
 gitbaseurl = ssh://%(user)s@pkgs.stg.fedoraproject.org/%(repo)s
 anongiturl = https://src.stg.fedoraproject.org/%(repo)s.git
-branchre = f\d$|f\d\d$|el\d$|olpc\d$|rawhide$
+branchre = f\d$|f\d\d$|(?:ep)?el\d+(?:\.\d+)?$|olpc\d$|rawhide$
 kojiprofile = stg
 build_client = koji
 clone_config_rpms =
diff --git a/conf/etc/rpkg/fedpkg.conf b/conf/etc/rpkg/fedpkg.conf
index ed4c318..bb21324 100644
--- a/conf/etc/rpkg/fedpkg.conf
+++ b/conf/etc/rpkg/fedpkg.conf
@@ -4,7 +4,7 @@ lookasidehash = sha512
 lookaside_cgi = https://src.fedoraproject.org/repo/pkgs/upload.cgi
 gitbaseurl = ssh://%(user)s@pkgs.fedoraproject.org/%(repo)s
 anongiturl = https://src.fedoraproject.org/%(repo)s.git
-branchre = f\d$|f\d\d$|el\d$|olpc\d$|rawhide$
+branchre = f\d$|f\d\d$|(?:ep)?el\d+(?:\.\d+)?$|olpc\d$|rawhide$
 kojiprofile = koji
 build_client = koji
 clone_config_rpms =
diff --git a/test/fedpkg-stage.conf b/test/fedpkg-stage.conf
index 14748a1..cd31128 100644
--- a/test/fedpkg-stage.conf
+++ b/test/fedpkg-stage.conf
@@ -4,7 +4,7 @@ gitbaseurl = ssh://%(user)s@pkgs.stg.example.com/%(repo)s
 lookaside_cgi = https://pkgs.stg.example.com/repo/pkgs/upload.cgi
 lookasidehash = sha512
 lookaside = http://pkgs.stg.example.com/repo/pkgs
-branchre = f\d$|f\d\d$|el\d$|olpc\d$|rawhide$
+branchre = f\d$|f\d\d$|(?:ep)?el\d+(?:\.\d+)?$|olpc\d$|rawhide$
 kojiprofile = koji
 build_client = koji
 distgit_namespaced = True
diff --git a/test/fedpkg-test.conf b/test/fedpkg-test.conf
index 44b331a..3a1e95e 100644
--- a/test/fedpkg-test.conf
+++ b/test/fedpkg-test.conf
@@ -4,7 +4,7 @@ gitbaseurl = ssh://%(user)s@pkgs.example.com/%(repo)s
 lookaside_cgi = https://pkgs.example.com/repo/pkgs/upload.cgi
 lookasidehash = sha512
 lookaside = http://pkgs.example.com/repo/pkgs
-branchre = f\d$|f\d\d$|el\d$|olpc\d$|rawhide$
+branchre = f\d$|f\d\d$|(?:ep)?el\d+(?:\.\d+)?$|olpc\d$|rawhide$
 kojiprofile = koji
 build_client = koji
 distgit_namespaced = True