diff options
| author | James Lopez <james@jameslopez.es> | 2016-07-07 09:49:46 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-07-07 09:49:46 +0200 |
| commit | 91a183bc57e0fccd12d08e861bd8a37b402d81f3 (patch) | |
| tree | a424a4696ce4b9b11a786bcf79c86893c0433107 | |
| parent | 400f9f72233c6c5390367a95bf11ebee09c86d2c (diff) | |
| download | gitlab-ce-91a183bc57e0fccd12d08e861bd8a37b402d81f3.tar.gz | |
fix log statements in import/export
| -rw-r--r-- | lib/gitlab/import_export/command_line_util.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/import_export/saver.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/import_export/command_line_util.rb b/lib/gitlab/import_export/command_line_util.rb index 62c736451b7..2249904145c 100644 --- a/lib/gitlab/import_export/command_line_util.rb +++ b/lib/gitlab/import_export/command_line_util.rb @@ -29,7 +29,7 @@ module Gitlab def execute(cmd) output, status = Gitlab::Popen.popen(cmd) - @shared.error(output.to_s) unless status.zero? + @shared.error(Gitlab::ImportExport::Error.new(output.to_s)) unless status.zero? status.zero? end diff --git a/lib/gitlab/import_export/saver.rb b/lib/gitlab/import_export/saver.rb index dd4fdf37309..6a60b65071f 100644 --- a/lib/gitlab/import_export/saver.rb +++ b/lib/gitlab/import_export/saver.rb @@ -17,7 +17,7 @@ module Gitlab Rails.logger.info("Saved project export #{archive_file}") archive_file else - @shared.error("Unable to save #{archive_file} into #{@shared.export_path}") + @shared.error(Gitlab::ImportExport::Error.new("Unable to save #{archive_file} into #{@shared.export_path}")) false end rescue => e |