summaryrefslogtreecommitdiff
path: root/lib/backup/manager.rb
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2014-05-08 11:02:04 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2014-05-08 18:23:44 +0200
commitda347d1bb45ad3b08b2aa0b40041c67dac0df3c5 (patch)
tree345f669e06f1b6ae3d6802eac300c3ea7d055948 /lib/backup/manager.rb
parent4917dc64693ad7131f6943497e4caee13f1c55ef (diff)
downloadgitlab-ce-da347d1bb45ad3b08b2aa0b40041c67dac0df3c5.tar.gz
Apply the locale encoding to `tar --version`
Fixes a bug with non-UTF8 locales introduced by 2b816075dc71dfe8f6f9e5349fdff7f03ad9dad0.
Diffstat (limited to 'lib/backup/manager.rb')
-rw-r--r--lib/backup/manager.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index 05814fc78f6..28e323fe30d 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -101,7 +101,7 @@ module Backup
def tar_version
tar_version, _ = Gitlab::Popen.popen(%W(tar --version))
- tar_version.split("\n").first
+ tar_version.force_encoding('locale').split("\n").first
end
end
end