Merge pull request #56 from dreilly1982/r10k/issues/43

Removed symlinked r10k fixture/modules directory.
voxpupuli · Jul 7, 2014 · a4257fa · a4257fa
2 parents f82ea7b + 1a5f29f
commit a4257fa
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -9,3 +9,5 @@ fixtures:
     vcsrepo: "git://github.com/puppetlabs/puppetlabs-vcsrepo.git"
     git:     "git://github.com/puppetlabs/puppetlabs-git.git"
     portage: "git://github.com/gentoo/puppet-portage.git"
+  symlinks:
+    r10k:    "#{source_dir}"
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 .swp
 pkg
-spec/fixtures/
 spec/fixtures/manifests/site.pp
 .DS_Store
 *.swp
diff --git a/spec/fixtures/modules/.gitignore b/spec/fixtures/modules/.gitignore
@@ -0,0 +1,5 @@
+# This keeps the modules directory available for fixtures
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/spec/fixtures/modules/r10k/files b/spec/fixtures/modules/r10k/files
diff --git a/spec/fixtures/modules/r10k/manifests b/spec/fixtures/modules/r10k/manifests
diff --git a/spec/fixtures/modules/r10k/templates b/spec/fixtures/modules/r10k/templates