Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
204efdea
Commit
204efdea
authored
Jan 17, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
24e9be42
a71d8e19
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
changelogs/unreleased/backup_restore_fix_issue_46891.yml
changelogs/unreleased/backup_restore_fix_issue_46891.yml
+5
-0
lib/backup/files.rb
lib/backup/files.rb
+8
-2
No files found.
changelogs/unreleased/backup_restore_fix_issue_46891.yml
0 → 100644
View file @
204efdea
---
title
:
Modify file restore to rectify tar issue
merge_request
:
24000
author
:
type
:
fixed
lib/backup/files.rb
View file @
204efdea
...
...
@@ -71,8 +71,14 @@ module Backup
end
def
run_pipeline!
(
cmd_list
,
options
=
{})
status_list
=
Open3
.
pipeline
(
*
cmd_list
,
options
)
raise
Backup
::
Error
,
'Backup failed'
unless
status_list
.
compact
.
all?
(
&
:success?
)
err_r
,
err_w
=
IO
.
pipe
options
[
:err
]
=
err_w
status
=
Open3
.
pipeline
(
*
cmd_list
,
options
)
err_w
.
close
return
if
status
.
compact
.
all?
(
&
:success?
)
regex
=
/^g?tar: \.: Cannot mkdir: No such file or directory$/
raise
Backup
::
Error
,
'Backup failed'
unless
err_r
.
read
=~
regex
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment