summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrohit <rohit.arondekar@gmail.com>2012-12-11 15:44:58 +0530
committerrohit <rohit.arondekar@gmail.com>2012-12-11 15:44:58 +0530
commit4205f39c4dedad24124ea2ad19ed068ea8713f8c (patch)
treed784d9625cfcbfd3f51a60759e300c53734a7710
parentaabdb3387e889396a5f2020e1a00e57b91928917 (diff)
downloadbundler-4205f39c4dedad24124ea2ad19ed068ea8713f8c.tar.gz
Fix the build
Specs were failing because of typo and inconsistency introduced in aabdb3387e.
-rw-r--r--lib/bundler.rb2
-rw-r--r--lib/bundler/dsl.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb
index 19f848707a..614b56da9f 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -55,7 +55,7 @@ module Bundler
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(2) ; 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
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index 78573941e3..7da64ef221 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -80,7 +80,7 @@ module Bundler
elsif dep.type == :development
return
else
- raise GemfileEror, "You cannot specify the same gem twice with different version requirements. \n" \
+ raise GemfileError, "You cannot specify the same gem twice with different version requirements. \n" \
"You specified: #{current.name} (#{current.requirement}) and " \
"#{dep.name} (#{dep.requirement})\n"
end
@@ -92,7 +92,7 @@ module Bundler
elsif dep.type == :development
return
else
- raise GemfileEror, "You cannot specify the same gem twice coming from different sources.\n" \
+ raise GemfileError, "You cannot specify the same gem twice coming from different sources.\n" \
"You specified that #{dep.name} (#{dep.requirement}) should come from " \
"#{current.source || 'an unspecified source'} and #{dep.source}\n"
end