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
1bf72a19
Commit
1bf72a19
authored
Sep 09, 2020
by
Evgeny Litvinov
Committed by
Michael Kozono
Sep 09, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Skip tar warnings during backup procedure
when files/folders changed
parent
de6fba24
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
changelogs/unreleased/litvinov-evgeny-7314-backup-files-skip-warning.yml
...leased/litvinov-evgeny-7314-backup-files-skip-warning.yml
+5
-0
lib/backup/files.rb
lib/backup/files.rb
+2
-2
No files found.
changelogs/unreleased/litvinov-evgeny-7314-backup-files-skip-warning.yml
0 → 100644
View file @
1bf72a19
---
title
:
Skip warning for file changed during backup instead of failing the backup operation
merge_request
:
40572
author
:
type
:
fixed
lib/backup/files.rb
View file @
1bf72a19
...
@@ -31,10 +31,10 @@ module Backup
...
@@ -31,10 +31,10 @@ module Backup
raise
Backup
::
Error
,
'Backup failed'
raise
Backup
::
Error
,
'Backup failed'
end
end
run_pipeline!
([
%W(
#{
tar
}
--exclude=lost+found -C
#{
@backup_files_dir
}
-cf - .)
,
gzip_cmd
],
out:
[
backup_tarball
,
'w'
,
0600
])
run_pipeline!
([
%W(
#{
tar
}
--
warning=no-file-changed --
exclude=lost+found -C
#{
@backup_files_dir
}
-cf - .)
,
gzip_cmd
],
out:
[
backup_tarball
,
'w'
,
0600
])
FileUtils
.
rm_rf
(
@backup_files_dir
)
FileUtils
.
rm_rf
(
@backup_files_dir
)
else
else
run_pipeline!
([
%W(
#{
tar
}
--exclude=lost+found -C
#{
app_files_dir
}
-cf - .)
,
gzip_cmd
],
out:
[
backup_tarball
,
'w'
,
0600
])
run_pipeline!
([
%W(
#{
tar
}
--
warning=no-file-changed --
exclude=lost+found -C
#{
app_files_dir
}
-cf - .)
,
gzip_cmd
],
out:
[
backup_tarball
,
'w'
,
0600
])
end
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