Gentoo Archives: gentoo-portage-dev

From: Brian Dolbec <dolsen@g.o>
To: gentoo-portage-dev@l.g.o
Subject: Re: [gentoo-portage-dev] Re: [PATCH] RsyncSync: don't pass None sync-rsync-extra-opts value into shlex_split
Date: Tue, 14 Jul 2015 20:04:08
Message-Id: 20150714130400.4e8b7784.dolsen@gentoo.org
In Reply to: [gentoo-portage-dev] Re: [PATCH] RsyncSync: don't pass None sync-rsync-extra-opts value into shlex_split by Zac Medico
1 On Tue, 14 Jul 2015 12:56:34 -0700
2 Zac Medico <zmedico@g.o> wrote:
3
4 > On Tue, Jul 14, 2015 at 12:52 PM, Zac Medico <zmedico@g.o>
5 > wrote:
6 > > This fixes an issue with SyncLocalTestCase hanging on my system.
7 > > ---
8 > > pym/portage/sync/modules/rsync/rsync.py | 2 +-
9 > > 1 file changed, 1 insertion(+), 1 deletion(-)
10 > >
11 > > diff --git a/pym/portage/sync/modules/rsync/rsync.py
12 > > b/pym/portage/sync/modules/rsync/rsync.py index 8041f07..f08bf5c
13 > > 100644 --- a/pym/portage/sync/modules/rsync/rsync.py
14 > > +++ b/pym/portage/sync/modules/rsync/rsync.py
15 > > @@ -73,7 +73,7 @@ class RsyncSync(NewBase):
16 > > self.rsync_opts = self._rsync_opts_extend(opts,
17 > > rsync_opts)
18 > >
19 > > self.extra_rsync_opts = list()
20 > > - if 'sync-rsync-extra-opts' in
21 > > self.repo.module_specific_options:
22 > > + if
23 > > self.repo.module_specific_options.get('sync-rsync-extra-opts'):
24 > > self.extra_rsync_opts.extend(portage.util.shlex_split( self.repo.module_specific_options['sync-rsync-extra-opts']))
25 > >
26 > > --
27 > > 2.3.6
28 > >
29 >
30 > I'm not sure if this is really the correct fix. Is there supposed to
31 > be a None 'sync-rsync-extra-opts' value in module_specific_options?
32 >
33
34 I don't think so, that may have been my fault when I sent Etiene my
35 partial rework on his patches.
36
37 --
38 Brian Dolbec <dolsen>

Replies