From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AE0D6138D19 for ; Tue, 14 Jul 2015 21:35:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82EADE0867; Tue, 14 Jul 2015 21:35:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F0A4AE0866 for ; Tue, 14 Jul 2015 21:35:54 +0000 (UTC) Received: from big_daddy.dol-sen.ca (S010634bdfa9ecf80.vc.shawcable.net [96.49.31.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id 04D223408C5 for ; Tue, 14 Jul 2015 21:35:53 +0000 (UTC) Date: Tue, 14 Jul 2015 14:35:51 -0700 From: Brian Dolbec To: gentoo-portage-dev@lists.gentoo.org Subject: Re: [gentoo-portage-dev] Re: [PATCH] RsyncSync: don't pass None sync-rsync-extra-opts value into shlex_split Message-ID: <20150714143551.0c971f07.dolsen@gentoo.org> In-Reply-To: <20150714130400.4e8b7784.dolsen@gentoo.org> References: <1436377602-10820-2-git-send-email-etienne.buira@gmail.com> <1436903543-30162-1-git-send-email-zmedico@gentoo.org> <20150714130400.4e8b7784.dolsen@gentoo.org> Organization: Gentoo Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Archives-Salt: 93487efc-25b8-462c-ae65-fc4d1e44ebaa X-Archives-Hash: b784e464c87af5035a4803f0d11d203f On Tue, 14 Jul 2015 13:04:00 -0700 Brian Dolbec wrote: > On Tue, 14 Jul 2015 12:56:34 -0700 > Zac Medico wrote: > > > On Tue, Jul 14, 2015 at 12:52 PM, Zac Medico > > wrote: > > > 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'])) > > > > > > -- > > > 2.3.6 > > > > > > > I'm not sure if this is really the correct fix. Is there supposed to > > be a None 'sync-rsync-extra-opts' value in module_specific_options? > > > > I don't think so, that may have been my fault when I sent Etiene my > partial rework on his patches. > All patches, Etiene's 2 original with some additional small fixes rebased in, plus a few more changes have been pushed to master now -- Brian Dolbec