fix ignores mixing

2013-12-05 16:35:56 +01:00
parent 027b3f51ed
commit 152f965a70
2 changed files with 4 additions and 1 deletions
--- a/xdist/slavemanage.py
+++ b/xdist/slavemanage.py
@@ -102,7 +102,7 @@ class NodeManager(object):
    def _getrsyncoptions(self):
        """Get options to be passed for rsync."""
        ignores = list(self.DEFAULT_IGNORES)
-        ignores = self.config.option.rsyncignore
+        ignores += self.config.option.rsyncignore
        ignores += self.config.getini("rsyncignore")

        return {