From 610c15ab73a104855ced4eb431cf867b02eacdee Mon Sep 17 00:00:00 2001 From: Knut Anderssen Date: Tue, 6 May 2025 07:09:06 +0100 Subject: [PATCH 1/4] Fix target file path --- service/lib/agama/storage/finisher.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/service/lib/agama/storage/finisher.rb b/service/lib/agama/storage/finisher.rb index 3a37feb5f9..049659ddec 100644 --- a/service/lib/agama/storage/finisher.rb +++ b/service/lib/agama/storage/finisher.rb @@ -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).sub(root_dir, "") + target = File.join(dest_dir, relative_path) FileUtils.mkdir_p(target) FileUtils.cp(file, target) From c7d81894f07b19613a462df6ca1d4e4432515ec4 Mon Sep 17 00:00:00 2001 From: Knut Anderssen Date: Tue, 6 May 2025 07:20:03 +0100 Subject: [PATCH 2/4] Added changelog --- service/package/rubygem-agama-yast.changes | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/service/package/rubygem-agama-yast.changes b/service/package/rubygem-agama-yast.changes index 6d6d08544e..8208714632 100644 --- a/service/package/rubygem-agama-yast.changes +++ b/service/package/rubygem-agama-yast.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 14 10:22:24 UTC 2025 - Knut Anderssen + +- 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). + ------------------------------------------------------------------- Fri May 9 15:37:04 UTC 2025 - Imobach Gonzalez Sosa From 95d92cbc72a9c31293d235943a654efd9149fe34 Mon Sep 17 00:00:00 2001 From: Knut Anderssen Date: Tue, 6 May 2025 07:49:54 +0100 Subject: [PATCH 3/4] Modified test to show the wrong target path concat --- service/test/agama/storage/finisher_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/test/agama/storage/finisher_test.rb b/service/test/agama/storage/finisher_test.rb index e3232fe6f8..b63775d3d7 100644 --- a/service/test/agama/storage/finisher_test.rb +++ b/service/test/agama/storage/finisher_test.rb @@ -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| From f58f711a9548179b91eaa42ff6a9bf57fc58e75f Mon Sep 17 00:00:00 2001 From: Knut Anderssen Date: Tue, 6 May 2025 07:50:32 +0100 Subject: [PATCH 4/4] Use delete_prefix as suggested --- service/lib/agama/storage/finisher.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/lib/agama/storage/finisher.rb b/service/lib/agama/storage/finisher.rb index 049659ddec..6d97f1d88e 100644 --- a/service/lib/agama/storage/finisher.rb +++ b/service/lib/agama/storage/finisher.rb @@ -146,7 +146,7 @@ def run? def run glob_files.each do |file| - relative_path = File.dirname(file).sub(root_dir, "") + relative_path = File.dirname(file).delete_prefix(root_dir) target = File.join(dest_dir, relative_path) FileUtils.mkdir_p(target)