bin/autoproj_bootstrap in autoproj-1.7.12 vs bin/autoproj_bootstrap in autoproj-1.7.13

- old
+ new

@@ -253,10 +253,18 @@ # both the version number (as a string) and/or the codename if there is # one. # # Examples: ['debian', ['sid', 'unstable']] or ['ubuntu', ['lucid lynx', '10.04']] def self.operating_system(options = Hash.new) - options = Kernel.validate_options options, :force => false + # Validate the options. We check on the availability of + # validate_options as to not break autoproj_bootstrap (in which + # validate_options is not available) + options = + if Kernel.respond_to?(:validate_options) + Kernel.validate_options options, :force => false + else + options.dup + end if !options[:force] if !@operating_system.nil? return @operating_system elsif Autoproj.has_config_key?('operating_system')