From 6047b3db1a3dbf4e9bbf02b739e70cecd0bcaf97 Mon Sep 17 00:00:00 2001 From: Ankur Sinha (Ankur Sinha Gmail) Date: Sep 03 2024 10:50:31 +0000 Subject: feat: allow slashed feature branch names Signed-off-by: Ankur Sinha (Ankur Sinha Gmail) --- diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py index 57a6eae..365d619 100644 --- a/fedpkg/__init__.py +++ b/fedpkg/__init__.py @@ -138,8 +138,12 @@ class Commands(pyrpkg.Commands): extra_rpmdefines = [] if not self._load_rpmdefines_branch(self.branch_merge, extra_rpmdefines): - base = self.branch_merge.split('-', 1) - # Allow branches like f38-staging + base = [] + if "-" in self.branch_merge: + base = self.branch_merge.split('-', 1) + if "/" in self.branch_merge: + base = self.branch_merge.split('/', 1) + # Allow branches like f38-staging and f38/staging if len(base) > 1: self.log.debug('Retrying with branch {}, feature {}' .format(base[0], base[1]))