discourse: Patch sources instead of using replace-literal

This commit is contained in:
talyz 2021-06-24 19:34:38 +02:00
parent 9af3672f4f
commit f0ae7fdf7e
No known key found for this signature in database
GPG key ID: 2DED2151F4671A2B
2 changed files with 26 additions and 2 deletions

View file

@ -199,6 +199,10 @@ let
# Log Unicorn messages to the journal and make request timeout
# configurable
./unicorn_logging_and_timeout.patch
# Use mv instead of rename, since rename doesn't work across
# device boundaries
./use_mv_instead_of_rename.patch
];
postPatch = ''
@ -207,8 +211,6 @@ let
# warnings and means we don't have to link back to lib from the
# state directory.
find config -type f -execdir sed -Ei "s,(\.\./)+(lib|app)/,$out/share/discourse/\2/," {} \;
${replace}/bin/replace-literal -f -r -e 'File.rename(temp_destination, destination)' "FileUtils.mv(temp_destination, destination)" .
'';
buildPhase = ''

View file

@ -0,0 +1,22 @@
diff --git a/lib/discourse.rb b/lib/discourse.rb
index ea2a3cbafd..66454d9157 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -62,7 +62,7 @@ module Discourse
fd.fsync()
end
- File.rename(temp_destination, destination)
+ FileUtils.mv(temp_destination, destination)
nil
end
@@ -76,7 +76,7 @@ module Discourse
FileUtils.mkdir_p(File.join(Rails.root, 'tmp'))
temp_destination = File.join(Rails.root, 'tmp', SecureRandom.hex)
execute_command('ln', '-s', source, temp_destination)
- File.rename(temp_destination, destination)
+ FileUtils.mv(temp_destination, destination)
nil
end