Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Zac Medico <zmedico@g.o>
Subject: [gentoo-portage-dev] [PATCH] RsyncSync: don't pass None sync-rsync-extra-opts value into shlex_split
Date: Tue, 14 Jul 2015 19:52:53
Message-Id: 1436903543-30162-1-git-send-email-zmedico@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH v3 2/2] sync: Enable to set rsync extra opts per repository by "Étienne Buira"
1 This fixes an issue with SyncLocalTestCase hanging on my system.
2 ---
3 pym/portage/sync/modules/rsync/rsync.py | 2 +-
4 1 file changed, 1 insertion(+), 1 deletion(-)
5
6 diff --git a/pym/portage/sync/modules/rsync/rsync.py b/pym/portage/sync/modules/rsync/rsync.py
7 index 8041f07..f08bf5c 100644
8 --- a/pym/portage/sync/modules/rsync/rsync.py
9 +++ b/pym/portage/sync/modules/rsync/rsync.py
10 @@ -73,7 +73,7 @@ class RsyncSync(NewBase):
11 self.rsync_opts = self._rsync_opts_extend(opts, rsync_opts)
12
13 self.extra_rsync_opts = list()
14 - if 'sync-rsync-extra-opts' in self.repo.module_specific_options:
15 + if self.repo.module_specific_options.get('sync-rsync-extra-opts'):
16 self.extra_rsync_opts.extend(portage.util.shlex_split(
17 self.repo.module_specific_options['sync-rsync-extra-opts']))
18
19 --
20 2.3.6

Replies