vagrant-parallels 1.3.1 → 1.3.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +2 -1
- data/lib/vagrant-parallels/action/network.rb +15 -3
- data/lib/vagrant-parallels/version.rb +1 -1
- data/test/unit/driver/pd_10_test.rb +0 -6
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6bdb95da989e46677cd7c63e85eabf039e464720
|
4
|
+
data.tar.gz: 072e752e92233ce0e8f1da2431f1cf435872e66c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 652fd511add11eb4016615ed50848090003f40bedc94ab2df8d52f16a487b6f54981fbf0cb5c5af60fb341947d96917350fdaa6aa5327a848e507c0673f19847
|
7
|
+
data.tar.gz: 43e877190dc0c166d3fd3922f04f9a71a675e4bac3b2343ec71b0f63ba6569cbc666a196a3aa81e95ac9a4fe5d7c8b773c77713235fbb70e35213a8135de44f8
|
data/.travis.yml
CHANGED
@@ -24,6 +24,7 @@ module VagrantPlugins
|
|
24
24
|
|
25
25
|
def call(env)
|
26
26
|
@env = env
|
27
|
+
@lock = Mutex.new
|
27
28
|
|
28
29
|
# Get the list of network adapters from the configuration
|
29
30
|
network_adapters_config = env[:machine].provider_config.network_adapters.dup
|
@@ -86,9 +87,20 @@ module VagrantPlugins
|
|
86
87
|
@logger.debug("Normalized configuration: #{config.inspect}")
|
87
88
|
|
88
89
|
# Get the virtual network adapter configuration
|
89
|
-
|
90
|
-
|
91
|
-
@
|
90
|
+
# We wrap this in locks to avoid race conditions between multiple
|
91
|
+
# Vagrant threads and/or processes.
|
92
|
+
@lock.synchronize do
|
93
|
+
begin
|
94
|
+
env[:machine].env.lock('parallels-network-adapters') do
|
95
|
+
adapter = send("#{type}_adapter", config)
|
96
|
+
adapters << adapter
|
97
|
+
@logger.debug("Adapter configuration: #{adapter.inspect}")
|
98
|
+
end
|
99
|
+
rescue Vagrant::Errors::EnvironmentLockedError
|
100
|
+
sleep 1
|
101
|
+
retry
|
102
|
+
end
|
103
|
+
end
|
92
104
|
|
93
105
|
# Get the network configuration
|
94
106
|
network = send("#{type}_network_config", config)
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vagrant-parallels
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.3.
|
4
|
+
version: 1.3.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Mikhail Zholobov
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2014-10-
|
12
|
+
date: 2014-10-12 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bundler
|