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

Replies