summaryrefslogtreecommitdiff
path: root/source_control/subversion.py
diff options
context:
space:
mode:
authorTim Barnes <tdba@bas.ac.uk>2015-10-09 15:15:53 +0100
committerTim Barnes <tdba@bas.ac.uk>2015-10-09 15:15:53 +0100
commitf0ac28490d026dcc0496f61db1baab995bedada7 (patch)
treedaf66edf3f915a329d904c8ee04c5d76c73fcabc /source_control/subversion.py
parent79e253053a92fbb2a98afb1fb95ff1dee0897425 (diff)
downloadansible-modules-core-f0ac28490d026dcc0496f61db1baab995bedada7.tar.gz
fixing issue with subversion module whereby the module was reporting local modifications being present when externals were being used
Diffstat (limited to 'source_control/subversion.py')
-rw-r--r--source_control/subversion.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/source_control/subversion.py b/source_control/subversion.py
index 24cc065c..64a1b38b 100644
--- a/source_control/subversion.py
+++ b/source_control/subversion.py
@@ -171,9 +171,10 @@ class Subversion(object):
'''True if revisioned files have been added or modified. Unrevisioned files are ignored.'''
lines = self._exec(["status", "--quiet", "--ignore-externals", self.dest])
# The --quiet option will return only modified files.
-
+ # Match only revisioned files, i.e. ignore status '?'.
+ regex = re.compile(r'^[^?X]')
# Has local mods if more than 0 modifed revisioned files.
- return len(filter(len, lines)) > 0
+ return len(filter(regex.match, lines)) > 0
def needs_update(self):
curr, url = self.get_revision()