vagrant 0.5.3 → 0.5.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/CHANGELOG.md +6 -0
- data/Gemfile.lock +1 -1
- data/lib/vagrant/commands/box/add.rb +7 -1
- data/lib/vagrant/commands/box/remove.rb +1 -2
- data/lib/vagrant/ssh.rb +1 -1
- data/lib/vagrant/util/platform.rb +5 -1
- data/lib/vagrant/version.rb +1 -1
- metadata +4 -4
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,9 @@
|
|
1
|
+
## 0.5.4 (September 7, 2010)
|
2
|
+
|
3
|
+
- Fix issue with the "exec failed" by running on Tiger as well.
|
4
|
+
- Give an error when downloading a box which already exists prior
|
5
|
+
to actually downloading the box.
|
6
|
+
|
1
7
|
## 0.5.3 (August 23, 2010)
|
2
8
|
|
3
9
|
- Add erubis as a dependency since its rendering of `erb` is sane.
|
data/Gemfile.lock
CHANGED
@@ -12,6 +12,12 @@ module Vagrant
|
|
12
12
|
return
|
13
13
|
end
|
14
14
|
|
15
|
+
box = Vagrant::Box.find(env, args[0])
|
16
|
+
if !box.nil?
|
17
|
+
error_and_exit(:box_already_exists)
|
18
|
+
return # for tests
|
19
|
+
end
|
20
|
+
|
15
21
|
Vagrant::Box.add(env, args[0], args[1])
|
16
22
|
end
|
17
23
|
|
@@ -21,4 +27,4 @@ module Vagrant
|
|
21
27
|
end
|
22
28
|
end
|
23
29
|
end
|
24
|
-
end
|
30
|
+
end
|
data/lib/vagrant/ssh.rb
CHANGED
@@ -41,7 +41,7 @@ module Vagrant
|
|
41
41
|
# (GH-51). As a workaround, we fork and wait. On all other platforms,
|
42
42
|
# we simply exec.
|
43
43
|
pid = nil
|
44
|
-
pid = fork if Util::Platform.leopard?
|
44
|
+
pid = fork if Util::Platform.leopard? || Util::Platform.tiger?
|
45
45
|
Kernel.exec "ssh #{command_options.join(" ")} #{options[:username]}@#{options[:host]}".strip if pid.nil?
|
46
46
|
Process.wait(pid) if pid
|
47
47
|
end
|
@@ -3,8 +3,12 @@ module Vagrant
|
|
3
3
|
# This class just contains some platform checking code.
|
4
4
|
class Platform
|
5
5
|
class << self
|
6
|
+
def tiger?
|
7
|
+
platform.include?("darwin8")
|
8
|
+
end
|
9
|
+
|
6
10
|
def leopard?
|
7
|
-
|
11
|
+
platform.include?("darwin9")
|
8
12
|
end
|
9
13
|
|
10
14
|
[:darwin, :bsd, :linux].each do |type|
|
data/lib/vagrant/version.rb
CHANGED
metadata
CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 0
|
7
7
|
- 5
|
8
|
-
-
|
9
|
-
version: 0.5.
|
8
|
+
- 4
|
9
|
+
version: 0.5.4
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- Mitchell Hashimoto
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2010-
|
18
|
+
date: 2010-09-07 00:00:00 -07:00
|
19
19
|
default_executable:
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|
@@ -422,7 +422,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
422
422
|
requirements:
|
423
423
|
- - ">="
|
424
424
|
- !ruby/object:Gem::Version
|
425
|
-
hash:
|
425
|
+
hash: 4041021020426251472
|
426
426
|
segments:
|
427
427
|
- 0
|
428
428
|
version: "0"
|