Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean hotfix directory before patching the srpm contents #537

Merged
merged 1 commit into from
Jan 3, 2025
Merged

Clean hotfix directory before patching the srpm contents #537

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions lib/manageiq/rpm_build/build_hotfix.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ def generate_rpm
where_am_i

Dir.chdir(HOTFIX_DIR) do
clean_hotfix_directory
unpack_srpm
update_spec
copy_patches
Expand Down Expand Up @@ -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")
Expand Down
Loading