diff options
| author | Andre Arko <andre@arko.net> | 2013-02-17 14:57:23 -0800 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2013-02-17 14:57:23 -0800 |
| commit | 15d1207aed22932240e62b4e33f23c161324f31e (patch) | |
| tree | 8ac45d2c1a73479e1b3384084af30fd9a202398a /lib/bundler.rb | |
| parent | 8f51a5a266567211e663644aba243791ff2ac3f4 (diff) | |
| parent | 9d5293812e832499dee1b6c2d515028d5aee8e36 (diff) | |
| download | bundler-15d1207aed22932240e62b4e33f23c161324f31e.tar.gz | |
Merge pull request #2007 from zofrex/issue-2000
Abort installation if Gemfile.lock contains merge conflict markers
Conflicts:
lib/bundler.rb
Diffstat (limited to 'lib/bundler.rb')
| -rw-r--r-- | lib/bundler.rb | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb index 2ac17a67..791a71cb 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -48,20 +48,21 @@ module Bundler end end - class GemfileNotFound < BundlerError; status_code(10) ; end - class GemNotFound < BundlerError; status_code(7) ; end - class GemfileError < BundlerError; status_code(4) ; end - class InstallError < BundlerError; status_code(5) ; end - class InstallHookError < BundlerError; status_code(6) ; end - class PathError < BundlerError; status_code(13) ; end - class GitError < BundlerError; status_code(11) ; end - class DeprecatedError < BundlerError; status_code(12) ; end - class GemspecError < BundlerError; status_code(14) ; end - class InvalidOption < BundlerError; status_code(15) ; end - class ProductionError < BundlerError; status_code(16) ; end - class HTTPError < BundlerError; status_code(17) ; end - class RubyVersionMismatch < BundlerError; status_code(18) ; end - class SecurityError < BundlerError; status_code(19) ; end + class GemfileNotFound < BundlerError; status_code(10) ; end + class GemNotFound < BundlerError; status_code(7) ; end + class GemfileError < BundlerError; status_code(4) ; end + class InstallError < BundlerError; status_code(5) ; end + class InstallHookError < BundlerError; status_code(6) ; end + class PathError < BundlerError; status_code(13) ; end + class GitError < BundlerError; status_code(11) ; end + class DeprecatedError < BundlerError; status_code(12) ; end + class GemspecError < BundlerError; status_code(14) ; end + class InvalidOption < BundlerError; status_code(15) ; end + class ProductionError < BundlerError; status_code(16) ; end + class HTTPError < BundlerError; status_code(17) ; end + class RubyVersionMismatch < BundlerError; status_code(18) ; end + class SecurityError < BundlerError; status_code(19) ; end + class LockfileError < BundlerError; status_code(20) ; end WINDOWS = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)! FREEBSD = RbConfig::CONFIG["host_os"] =~ /bsd/ |