Merge remote-tracking branch 'puppetlabs/1.0.x'

3 files changed, 15 insertions, 3 deletions

diff --git a/spec/acceptance/beaker/git/create/create_bare_repo_that_already_exists.rb b/spec/acceptance/beaker/git/create/create_bare_repo_that_already_exists.rb
index b72963b..ccb8a70 100644
--- a/spec/acceptance/beaker/git/create/create_bare_repo_that_already_exists.rb
+++ b/spec/acceptance/beaker/git/create/create_bare_repo_that_already_exists.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_bare_repo_already_exists.git'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create bare repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     on(host, "mkdir #{tmpdir}/#{repo_name}")
     on(host, "cd #{tmpdir}/#{repo_name} && git --bare init")
   end
diff --git a/spec/acceptance/beaker/git/create/create_repo_that_already_exists.rb b/spec/acceptance/beaker/git/create/create_repo_that_already_exists.rb
index f31dda0..8fb8543 100644
--- a/spec/acceptance/beaker/git/create/create_repo_that_already_exists.rb
+++ b/spec/acceptance/beaker/git/create/create_repo_that_already_exists.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_already_exists'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/create/negative/create_bare_repo_specifying_revision.rb b/spec/acceptance/beaker/git/create/negative/create_bare_repo_specifying_revision.rb
index ece10a5..5b789df 100644
--- a/spec/acceptance/beaker/git/create/negative/create_bare_repo_specifying_revision.rb
+++ b/spec/acceptance/beaker/git/create/negative/create_bare_repo_specifying_revision.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_bare.git'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
   end
 
   teardown do