Merge pull request #537 from jrafanie/clean_hotfix_directory

Clean hotfix directory before patching the srpm contents
ManageIQ · Jan 3, 2025 · 4adf2af · 4adf2af
2 parents 43e6a84 + 8894d25
commit 4adf2af
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/lib/manageiq/rpm_build/build_hotfix.rb b/lib/manageiq/rpm_build/build_hotfix.rb
@@ -14,6 +14,7 @@ def generate_rpm
         where_am_i
 
         Dir.chdir(HOTFIX_DIR) do
+          clean_hotfix_directory
           unpack_srpm
           update_spec
           copy_patches
@@ -64,6 +65,11 @@ def update_spec
         File.write(rpm_spec, spec_text)
       end
 
+      def clean_hotfix_directory
+        files = Dir.glob("*[!.src.rpm]")
+        FileUtils.rm_f(files, :verbose => true)
+      end
+
       def unpack_srpm
         srpm = Dir.glob("*.src.rpm").first
         shell_cmd("rpm2cpio #{srpm} | cpio -idmv")