Skip to content

Fix target file path #2328

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

Merged
teclator merged 4 commits into from
May 6, 2025
Merged

Fix target file path #2328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d94e182
Fix target file path
teclator May 6, 2025
6471753
Added changelog
teclator May 6, 2025
f6e422a
Modified test to show the wrong target path concat
teclator May 6, 2025
b7edf3f
Use delete_prefix as suggested
teclator May 6, 2025
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
3 changes: 2 additions & 1 deletion service/lib/agama/storage/finisher.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ def run?

def run
glob_files.each do |file|
target = File.dirname(file).sub(root_dir, dest_dir)
relative_path = File.dirname(file).delete_prefix(root_dir)
target = File.join(dest_dir, relative_path)

FileUtils.mkdir_p(target)
FileUtils.cp(file, target)
Expand Down
7 changes: 7 additions & 0 deletions service/package/rubygem-agama-yast.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 6 06:09:24 UTC 2025 - Knut Anderssen <kanderssen@suse.com>

- Fix the target path for copying the udev rules and nvme files
introduced by (bsc#123808, gh#agama-project/agama#2257).
(bsc#1241868, gh#agama-project/agama#2328).

-------------------------------------------------------------------
Tue Apr 22 14:14:52 UTC 2025 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>

Expand Down
2 changes: 1 addition & 1 deletion service/test/agama/storage/finisher_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
subject { copy_files }
before do
allow(Yast::Installation).to receive(:destdir).and_return(destdir)
allow(subject).to receive(:root_dir).and_return(File.join(FIXTURES_PATH, "root_dir"))
allow(subject).to receive(:root_dir).and_return(File.join(FIXTURES_PATH, "root_dir/"))
end

around do |block|
Expand Down
Loading