diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-01-13 10:13:39 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-01-14 12:48:16 +0100 |
| commit | a9783c439bd6e3322b6fc72371c9fe3837a63be5 (patch) | |
| tree | 7181f1e58715891a128617f1e362135a692c51ba /lib | |
| parent | 0b946029a1fb429db39fbec0cddccf40f7e2aa08 (diff) | |
| download | gitlab-ce-a9783c439bd6e3322b6fc72371c9fe3837a63be5.tar.gz | |
Make encoding of paths returned by metadata consistent (UTF-8)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/build/artifacts/metadata.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/ci/build/artifacts/metadata.rb b/lib/gitlab/ci/build/artifacts/metadata.rb index 47efc51a76e..0c252c0bf30 100644 --- a/lib/gitlab/ci/build/artifacts/metadata.rb +++ b/lib/gitlab/ci/build/artifacts/metadata.rb @@ -20,7 +20,7 @@ module Gitlab end def errors - gzip do|gz| + gzip do |gz| read_string(gz) # version errors = read_string(gz) raise StandardError, 'Errors field not found!' unless errors @@ -36,7 +36,7 @@ module Gitlab end def to_path - Path.new(@path, *match!) + Path.new(@path.dup.force_encoding('UTF-8'), *match!) end private @@ -88,7 +88,7 @@ module Gitlab def read_string(gz) string_size = read_uint32(gz) - return false unless string_size + return nil unless string_size gz.read(string_size) end |