[OS-BUILD PATCH] Don't create empty pending-common files on pending-fedora commits

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Don Zickus <dzickus@xxxxxxxxxx>

Don't create empty pending-common files on pending-fedora commits

There is a bug in gen_config_patches.sh which will assumes all new
configs are in redhat/configs/pending-common.  This is not true
for pending-fedora configs.  As a result the script reads the
pending-feodra config and tries to copy a pending-common config
into the final location.

The pending-common file does not exist thus creating an empty final
config file.

Fix this by filtering out any pending-fedora configs from the list of
configs to process.

Tested manually.

Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>

diff a/redhat/gen_config_patches.sh b/redhat/gen_config_patches.sh
--- a/redhat/gen_config_patches.sh
+++ b/redhat/gen_config_patches.sh
@@ -23,7 +23,8 @@ function cleanup {
 trap cleanup EXIT
 
 # Easy way to get each of the files to process
-git diff --name-only HEAD HEAD^ > "$tmpdir"/new_config_files
+# Not interested in Fedora configs
+git diff --name-only HEAD HEAD^ | grep -v "pending-fedora" > "$tmpdir"/new_config_files
 
 while read -r line; do
 	# Read all the files and split up by file path of each config item.

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1060
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure




[Index of Archives]     [Fedora General Discussion]     [Older Fedora Users Archive]     [Fedora Advisory Board]     [Fedora Security]     [Fedora Devel Java]     [Fedora Legacy]     [Fedora Desktop]     [ATA RAID]     [Fedora Marketing]     [Fedora Mentors]     [Fedora Package Announce]     [Fedora Package Review]     [Fedora Music]     [Fedora Packaging]     [Centos]     [Fedora SELinux]     [Coolkey]     [Yum Users]     [Tux]     [Yosemite News]     [KDE Users]     [Fedora Art]     [Fedora Docs]     [USB]     [Asterisk PBX]

  Powered by Linux