Merge pull request #441 from matschaffer/tmp-exclusion-removal-408

Remove tmp from exclusions
matschaffer · Jul 2, 2015 · 6f7ae02 · 6f7ae02
2 parents 8be45ab + 5b64cbd
commit 6f7ae02
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/lib/chef/knife/solo_cook.rb b/lib/chef/knife/solo_cook.rb
@@ -197,7 +197,7 @@ def rsync_permissions
       end
 
       def rsync_excludes
-        (%w{revision-deploys tmp .git .hg .svn .bzr} + chefignore.ignores).uniq
+        (%w{revision-deploys .git .hg .svn .bzr} + chefignore.ignores).uniq
       end
 
       def debug?

diff --git a/test/solo_cook_test.rb b/test/solo_cook_test.rb
@@ -52,7 +52,6 @@ def test_rsync_without_gateway_connection_options
                                   '-rL',
                                   '--rsh=ssh ssh_arguments',
                                   '--exclude=revision-deploys',
-                                  '--exclude=tmp',
                                   '--exclude=.git',
                                   '--exclude=.hg',
                                   '--exclude=.svn',
@@ -76,7 +75,6 @@ def test_rsync_with_gateway_connection_options
                                   '-rL',
                                   '--rsh=ssh -TA user@gateway ssh -T -o StrictHostKeyChecking=no ssh_arguments',
                                   '--exclude=revision-deploys',
-                                  '--exclude=tmp',
                                   '--exclude=.git',
                                   '--exclude=.hg',
                                   '--exclude=.svn',