merge with mainline

2013-12-06 10:20:03 +01:00
parent bcf1c85f44 a3fac52e85
commit 27f1d8049b
1 changed files with 1 additions and 1 deletions
--- a/xdist/slavemanage.py
+++ b/xdist/slavemanage.py
@@ -160,7 +160,7 @@ class HostRSync(execnet.RSync):
        for x in self._ignores:
            x = getattr(x, 'strpath', x)
            if fnmatch.fnmatch(path.basename, x) or fnmatch.fnmatch(path.strpath, x):
-                break
+                return False
        else:
            return True