vagrant-parallels 2.0.0 → 2.0.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a40565034c3032c1536e75c37bd10287c87200e0
4
- data.tar.gz: fcf16876294f17f6843c1acbe698ba111cbfee5f
3
+ metadata.gz: 85e2c532a3b4223860ba143a446100ef6c3744f9
4
+ data.tar.gz: c99d45686b5d6c5463c9d65ad93559f19ea48cbf
5
5
  SHA512:
6
- metadata.gz: f983701a46e36b8d189d80c6906868d91b3a35840b849cdcdc301ec8f660cc851de3ebbb045eb924dd8dd201b1aebe3fd2c8a69f1db8425b2bb2380d30b7b6b0
7
- data.tar.gz: bb2f8d87c5fa5b3332cdcbdea5a9e411ddf3941bfcc12cc4e8b5693edb114aa7295f3ab63f627721fe3a87c860d1a4a42b7e3f3a066e498b1861522cea1a1999
6
+ metadata.gz: 43842f0c8f79ffdf6be311cf7bcac234697a1f82d70da62760604536ffa40eaf7a4d1c12f16c366988ccab1c3ea636606dc5c1bb6299c2bc3e98609f9683bbd6
7
+ data.tar.gz: f5dd3bced88d5f7d0721232dcd25f7f455856ed38391dd1dadbe045c712f891ba381831ebccfc0d8ed579c56bc854ec8a8d88307b23d8cde409f4556b677a9a3
@@ -1,3 +1,8 @@
1
+ ## 2.0.1 (April 23, 2019)
2
+ BUG FIXES:
3
+ - Fixed the error message for host-only network collision
4
+ [[GH-340](https://github.com/Parallels/vagrant-parallels/issues/340)]
5
+
1
6
  ## 2.0.0 (November 19, 2018)
2
7
  BREAKING CHANGES:
3
8
  - **Linked Clone feature is enabled by default.**
@@ -291,7 +291,12 @@ module VagrantPlugins
291
291
  @env[:machine].provider.driver.read_bridged_interfaces.each do |interface|
292
292
  next if interface[:status] == 'Down'
293
293
  that_netaddr = IPAddr.new("#{interface[:ip]}/#{interface[:netmask]}")
294
- raise Vagrant::Errors::NetworkCollision if netaddr.include? that_netaddr
294
+ if netaddr.include? that_netaddr
295
+ raise VagrantPlugins::Parallels::Errors::NetworkCollision,
296
+ hostonly_netaddr: netaddr,
297
+ bridge_netaddr: that_netaddr,
298
+ bridge_interface: interface[:name]
299
+ end
295
300
  end
296
301
  end
297
302
 
@@ -39,6 +39,10 @@ module VagrantPlugins
39
39
  error_key(:mac_os_x_required)
40
40
  end
41
41
 
42
+ class NetworkCollision < VagrantParallelsError
43
+ error_key(:network_collision)
44
+ end
45
+
42
46
  class NetworkInvalidAddress < VagrantParallelsError
43
47
  error_key(:network_invalid_address)
44
48
  end
@@ -104,4 +108,4 @@ module VagrantPlugins
104
108
  end
105
109
  end
106
110
  end
107
- end
111
+ end
@@ -1,5 +1,5 @@
1
1
  module VagrantPlugins
2
2
  module Parallels
3
- VERSION = '2.0.0'
3
+ VERSION = '2.0.1'
4
4
  end
5
5
  end
@@ -58,6 +58,14 @@ en:
58
58
  which are not supported by "prl_fs" file system.
59
59
 
60
60
  Invalid mount options: %{options}
61
+ network_collision: |-
62
+ The specified host network collides with a non-hostonly network!
63
+ This will cause your specified IP to be inaccessible. Please change
64
+ the IP or name of your host only network so that it no longer matches that of
65
+ a bridged or non-hostonly network.
66
+
67
+ Host-only Network Address: '%{hostonly_netaddr}'
68
+ Bridged Network '%{bridge_interface}': '%{bridge_netaddr}'
61
69
  network_invalid_address: |-
62
70
  Network settings specified in your Vagrantfile are invalid:
63
71
 
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: 2.0.0
4
+ version: 2.0.1
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: 2018-11-19 00:00:00.000000000 Z
12
+ date: 2019-04-23 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: nokogiri