Actually pay attention to the 'delete' parameter for Gentoo bug #301769

diff --git a/ChangeLog b/ChangeLog
index f10273164a382c89696439bfd923cf390063c3b1..77c507677f2fb6b1c6eb37c350da482412def19c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  22 Jan 2010; Andrew Gaffney <agaffney@gentoo.org>
+  modules/catalyst/util.py:
+  Actually pay attention to the 'delete' parameter for Gentoo bug #301769
+
   20 Jan 2010; Andrew Gaffney <agaffney@gentoo.org>
   modules/catalyst/util.py:
   Missing space in catalyst.util.list_bashify()

diff --git a/modules/catalyst/util.py b/modules/catalyst/util.py
index 7427ac1bc254956c613989c10da807d7b14e7566..0cb9ed178bc602f8c1c373e9eb8909970a7279f2 100644 (file)
--- a/modules/catalyst/util.py
+++ b/modules/catalyst/util.py
@@ -239,7 +239,10 @@ def create_symlink(src, dest, remove_existing=False):
                raise CatalystError("Could not create symlink '%s' to '%s'" % (dest, src))
 
 def rsync(src, dest, delete=False, extra_opts=""):
-       retval = catalyst.spawn.spawn_bash("rsync -a --delete %s %s %s" % (extra_opts, src, dest))
+       delete_opts = ""
+       if delete:
+               delete_opts = "--delete"
+       retval = catalyst.spawn.spawn_bash("rsync -a %s %s %s %s" % (delete_opts, extra_opts, src, dest))
        if retval != 0:
                raise CatalystError("Could not rsync '%s' to '%s'" % (src, dest))