summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-03-13 02:30:30 -0700
committerelijah <elijah@riseup.net>2013-03-13 02:30:30 -0700
commit6b229e96a1de9929157f8142dca8d1f19086046b (patch)
treee2a90cdc811223cecd3e50f4f32f03ace49db7e8
parentc423efee0ee0ac8fa13216e657198214ff27bb26 (diff)
Revert "added @platform_branch to Leapfile"
This reverts commit c423efee0ee0ac8fa13216e657198214ff27bb26.
-rw-r--r--lib/leap_cli/leapfile.rb14
1 files changed, 2 insertions, 12 deletions
diff --git a/lib/leap_cli/leapfile.rb b/lib/leap_cli/leapfile.rb
index 8300090..06db3b4 100644
--- a/lib/leap_cli/leapfile.rb
+++ b/lib/leap_cli/leapfile.rb
@@ -34,18 +34,8 @@ module LeapCli
@platform_directory_path = File.expand_path(@platform_directory_path || '../leap_platform', @provider_directory_path)
if @allow_production_deploy.nil?
# by default, only allow production deploys from 'master' or if not a git repo
- @allow_production_deploy = !Util.is_git_directory?(@provider_directory_path) ||
- Util.current_git_branch(@provider_directory_path) == 'master'
- end
- if @platform_branch && Util.is_git_directory?(@platform_directory_path)
- Util.assert!(
- Util.current_git_branch(@platform_directory_path) == @platform_branch,
- "@platform_branch is set to '%s', but current branch of %s is '%s'." % [
- @platform_branch,
- @platform_directory_path,
- Util.current_git_branch(@platform_directory_path)
- ]
- )
+ @allow_production_deploy = !LeapCli::Util.is_git_directory?(@provider_directory_path) ||
+ LeapCli::Util.current_git_branch(@provider_directory_path) == 'master'
end
return true
end