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
226cc27d
Commit
226cc27d
authored
Feb 22, 2020
by
Henrik Christian Grove
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Flatten else branch in #unpack
parent
3c67718b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
18 deletions
+16
-18
lib/backup/manager.rb
lib/backup/manager.rb
+16
-18
No files found.
lib/backup/manager.rb
View file @
226cc27d
...
@@ -136,11 +136,10 @@ module Backup
...
@@ -136,11 +136,10 @@ module Backup
exit
1
exit
1
end
end
else
# check for existing backups in the backup dir
# check for existing backups in the backup dir
if
File
.
exist?
(
File
.
join
(
backup_path
,
'backup_information.yml'
))
els
if
File
.
exist?
(
File
.
join
(
backup_path
,
'backup_information.yml'
))
progress
.
puts
"Non tarred backup found in
#{
backup_path
}
, using that"
progress
.
puts
"Non tarred backup found in
#{
backup_path
}
, using that"
return
false
break
false
elsif
backup_file_list
.
empty?
elsif
backup_file_list
.
empty?
progress
.
puts
"No backups found in
#{
backup_path
}
"
progress
.
puts
"No backups found in
#{
backup_path
}
"
progress
.
puts
"Please make sure that file name ends with
#{
FILE_NAME_SUFFIX
}
"
progress
.
puts
"Please make sure that file name ends with
#{
FILE_NAME_SUFFIX
}
"
...
@@ -155,7 +154,6 @@ module Backup
...
@@ -155,7 +154,6 @@ module Backup
else
else
tar_file
=
backup_file_list
.
first
tar_file
=
backup_file_list
.
first
end
end
end
progress
.
print
'Unpacking backup ... '
progress
.
print
'Unpacking backup ... '
...
...
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