commit: bb0282d265dbe209639280964b1733c842d466ed
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 19:52:23 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Jul 14 21:28:31 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=bb0282d2
RsyncSync: don't pass None sync-rsync-extra-opts value into shlex_split
This fixes an issue with SyncLocalTestCase hanging on my system.
pym/portage/sync/modules/rsync/rsync.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pym/portage/sync/modules/rsync/rsync.py
b/pym/portage/sync/modules/rsync/rsync.py
index 8041f07..f08bf5c 100644
--- a/pym/portage/sync/modules/rsync/rsync.py
+++ b/pym/portage/sync/modules/rsync/rsync.py
@@ -73,7 +73,7 @@ class RsyncSync(NewBase):
self.rsync_opts = self._rsync_opts_extend(opts, rsync_opts)
self.extra_rsync_opts = list()
- if 'sync-rsync-extra-opts' in self.repo.module_specific_options:
+ if
self.repo.module_specific_options.get('sync-rsync-extra-opts'):
self.extra_rsync_opts.extend(portage.util.shlex_split(
self.repo.module_specific_options['sync-rsync-extra-opts']))
