diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-04-07 13:17:55 +0400 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-04-07 13:22:27 +0400 |
| commit | bcfd9386f54f12bf5b294686afbc6bcdad8a39c5 (patch) | |
| tree | 980d480a8a6322e739062cb42dce48861e80f1eb | |
| parent | bfd4494890c80e131d606c5026ea3e1146e7d4d0 (diff) | |
Fix popen bug in `rake gitlab:satellites:create`
The Satellite#create method no longer sets the `$?` global variable.
Instead, we can use the method return value to test if the satellite was
created successfully
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/tasks/gitlab/enable_automerge.rake | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG index 59e3e22524b..d0613c301ea 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,7 @@ v 6.8.0 - Create branches via API (sponsored by O'Reilly Media) - Changed permission of gitlab-satellites directory not to be world accessible - Protected branch does not allow force push + - Fix popen bug in `rake gitlab:satellites:create` v 6.7.3 - Fix the merge notification email not being sent (Pierre de La Morinerie) diff --git a/lib/tasks/gitlab/enable_automerge.rake b/lib/tasks/gitlab/enable_automerge.rake index 6822e5cf1ad..aa9869daf2f 100644 --- a/lib/tasks/gitlab/enable_automerge.rake +++ b/lib/tasks/gitlab/enable_automerge.rake @@ -27,11 +27,8 @@ namespace :gitlab do if project.satellite.exists? puts "exists already".green else - puts "" - project.satellite.create - - print "... " - if $?.success? + print "\n... " + if project.satellite.create puts "created".green else puts "error".red |