jenkins-bot has submitted this change and it was merged.
Change subject: Fixed corruption of settings file on Windows
......................................................................
Fixed corruption of settings file on Windows
Fixed exclusive file write in Settings.configure to flush io before
truncation and use resulting file position over number of bytes written
by IO#write.
Bug: 69932
Change-Id: I807dac564ed52e672eb92595c1f2895007180613
---
M lib/mediawiki-vagrant/settings.rb
M lib/mediawiki-vagrant/version.rb
2 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
BryanDavis: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki-vagrant/settings.rb
b/lib/mediawiki-vagrant/settings.rb
index 52b3b40..6662a19 100644
--- a/lib/mediawiki-vagrant/settings.rb
+++ b/lib/mediawiki-vagrant/settings.rb
@@ -58,8 +58,9 @@
yield settings
- file.truncate(settings.save(file))
+ settings.save(file)
file.flush
+ file.truncate(file.pos)
ensure
file.flock(File::LOCK_UN)
end
diff --git a/lib/mediawiki-vagrant/version.rb b/lib/mediawiki-vagrant/version.rb
index f548f1b..427c140 100644
--- a/lib/mediawiki-vagrant/version.rb
+++ b/lib/mediawiki-vagrant/version.rb
@@ -1,3 +1,3 @@
module MediaWikiVagrant
- VERSION = '0.1.0'
+ VERSION = '0.1.1'
end
--
To view, visit https://gerrit.wikimedia.org/r/155862
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I807dac564ed52e672eb92595c1f2895007180613
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Dduvall <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
