From baba1d70bcc07e008b2400074848dc5c32ca9ee4 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 22 Sep 2017 18:00:50 -0500 Subject: [PATCH] Don't double quote rsync options We needed to in Ansible 2.1 - but in 2.3 it breaks things. Change-Id: Iecac280fdcbbf89ad28bd2e09936eed222bdc373 --- zuul/cmd/migrate.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zuul/cmd/migrate.py b/zuul/cmd/migrate.py index 1b2e44ee5e..8ed098b313 100644 --- a/zuul/cmd/migrate.py +++ b/zuul/cmd/migrate.py @@ -542,9 +542,9 @@ class Job: # want no matter how deep it is), exclude anything that # doesn't match the thing we want or is a directory, then get # rid of empty directories left over at the end. - rsync_opts = ['--include="%s"' % source, - '--include="*/"', - '--exclude="*"', + rsync_opts = ['--include=%s' % source, + '--include=*/', + '--exclude=*', '--prune-empty-dirs'] return rsync_opts