summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAlejandro Rodríguez <alejorro70@gmail.com>2016-10-05 18:26:45 -0300
committerAlejandro Rodríguez <alejorro70@gmail.com>2016-10-05 18:26:45 -0300
commit9dc7a11955b35cc2edb105898a59d914796702f2 (patch)
treea7b66ce3f82fef704187501780967c59ab1e825b /lib
parentfad9498c1b15e96bf553064d77dc33c17ff7baa7 (diff)
downloadgitlab-shell-9dc7a11955b35cc2edb105898a59d914796702f2.tar.gz
Fix short circuit logic between rsync with and without ionice for
storage migrations
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab_projects.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb
index 3d92cf2..d3d45ae 100644
--- a/lib/gitlab_projects.rb
+++ b/lib/gitlab_projects.rb
@@ -321,7 +321,9 @@ class GitlabProjects
rsync_path = 'ionice -c2 -n7 rsync'
result = system(*%W(#{rsync_path} -a --delete --rsync-path="#{rsync_path}" #{source_path} #{new_full_path}))
- unless result
+ if result
+ true
+ else
# If the command fails with `ionice` (maybe because we're on a OS X
# development machine), try again without `ionice`.
rsync_path = 'rsync'