lib/vagrant-conoha/config.rb in vagrant-conoha-0.1.1 vs lib/vagrant-conoha/config.rb in vagrant-conoha-0.1.2

@@ -370,10 +370,10 @@
       end
 
       private
 
       def validate_admin_pass(errors)
-        return if @admin_pass == '' or @admin_pass == nil
+        return if @admin_pass == '' || @admin_pass.nil?
 
         reg = /\A(?=.*?[A-Z])(?=.*?[a-z])(?=.*?\d)(?=.*?[!-~&&[^A-Za-z\d]])[!-~]{9,70}+\z/
         errors << I18n.t('vagrant_openstack.config.invalid_admin_pass') unless @admin_pass =~ reg
       end