summaryrefslogtreecommitdiff
path: root/lib/rubygems/install_update_options.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/rubygems/install_update_options.rb')
-rw-r--r--lib/rubygems/install_update_options.rb16
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/rubygems/install_update_options.rb b/lib/rubygems/install_update_options.rb
index 4e7f9e7952..f3ec1aa12a 100644
--- a/lib/rubygems/install_update_options.rb
+++ b/lib/rubygems/install_update_options.rb
@@ -1,3 +1,9 @@
+######################################################################
+# This file is imported from the rubygems project.
+# DO NOT make modifications in this repo. They _will_ be reverted!
+# File a patch instead and assign it to Ryan Davis or Eric Hodel.
+######################################################################
+
#--
# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
# All rights reserved.
@@ -58,10 +64,6 @@ module Gem::InstallUpdateOptions
options[:force] = value
end
- add_option(:"Install/Update", '-t', '--[no-]test',
- 'Ignored; just for compatiblity') do |value, options|
- end
-
add_option(:"Install/Update", '-w', '--[no-]wrappers',
'Use bin wrappers for executables',
'Not available on dosish platforms') do |value, options|
@@ -103,6 +105,12 @@ module Gem::InstallUpdateOptions
"dependencies") do |value, options|
options[:development] = true
end
+
+ add_option(:"Install/Update", "--conservative",
+ "Don't attempt to upgrade gems already",
+ "meeting version requirement") do |value, options|
+ options[:conservative] = true
+ end
end
##