mirror of
https://github.com/vagrant-libvirt/vagrant-libvirt.git
synced 2025-02-25 18:55:27 -06:00
Avoid blanking username if set by user (#1352)
While the username may not be used unless the connection is via ssh, should avoid forcing to nil by accident when re-parsing from the uri.
This commit is contained in:
@@ -1037,10 +1037,12 @@ module VagrantPlugins
|
||||
end
|
||||
end
|
||||
|
||||
# Extract host and username values from uri if provided, otherwise nil
|
||||
# Extract host values from uri if provided, otherwise nil
|
||||
@host = uri.host
|
||||
@port = uri.port
|
||||
@username = uri.user
|
||||
# only override username if there is a value provided
|
||||
@username = nil if @username == UNSET_VALUE
|
||||
@username = uri.user if uri.user
|
||||
if uri.query
|
||||
params = CGI.parse(uri.query)
|
||||
@id_ssh_key_file = params['keyfile'].first if params.has_key?('keyfile')
|
||||
|
||||
Reference in New Issue
Block a user