From 91cd7488be6bbd9ea1a97f435b82307ddbf905c4 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: May 23 2024 17:21:49 +0000 Subject: Allow package.cfg on rawhide/main branch Certain packages (such as fwupd and grub2) cannot be auto-rebuilt for Fedora ELN due to signing requirements. They have to be built manually by one of the short list of people that have the correct privilege. It's easy to forget to build for both releases, so it would be ideal if we could instead allow them to carry a package.cfg file on the Rawhide branch that would result in `fedpkg build` building for both Rawhide and ELN at the same time. This patch leaves in place the check for release branches (f40, f39, etc.) so that the presence of the package.cfg will not have an effect once Rawhide is branched. Signed-off-by: Stephen Gallagher --- diff --git a/fedpkg/utils.py b/fedpkg/utils.py index eaa47ab..2cc2d19 100644 --- a/fedpkg/utils.py +++ b/fedpkg/utils.py @@ -517,9 +517,7 @@ def get_stream_branches(server_url, package_name): # should be ok to remove if from this list. stream_branches = [] for item in branches: - if item['name'] in ('rawhide', 'main'): - continue - elif re.match(r'^(f|el)\d+$', item['name']): + if re.match(r'^(f|el)\d+$', item['name']): continue # epel7 is regular release branch # epel8 and above should be considered a stream branch to use