From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-portage-dev+bounces-4965-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 7D34D138D19
for <garchives@archives.gentoo.org>; Tue, 14 Jul 2015 19:56:37 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 80FEBE0878;
Tue, 14 Jul 2015 19:56:36 +0000 (UTC)
Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com [209.85.217.175])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id D6A9FE0876
for <gentoo-portage-dev@lists.gentoo.org>; Tue, 14 Jul 2015 19:56:35 +0000 (UTC)
Received: by lbbyj8 with SMTP id yj8so12558336lbb.0
for <gentoo-portage-dev@lists.gentoo.org>; Tue, 14 Jul 2015 12:56:34 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20120113;
h=mime-version:sender:in-reply-to:references:date:message-id:subject
:from:to:content-type;
bh=n+9In0LzRRpdJXW5X2QFGoFRTtnCIAhU9/q2b4QYVv4=;
b=XugfvXX7gNthVUxNLFW2bjt8vDlTKw0RnYKZe58pMsvNWRofkpY5gCPNzboFYcru0E
Zo9RBbHyELl9GsvAxGet4yzvBAlgNli/PH6dpjf18nDOJNVRG5ERW6ogKXRCXd8Ihkd5
vWAo2KQ6DmMIIDwoVZm5l6YUw6NQiDdY8fEU1OdP8NsQ2Hx2NMC2ftrRgo5RZ5kiqbT2
x2Hx/YM7puQY4wEA7qAzv9D3d6JqlACz/lLFJ37E1LWG+WyMTHCJ11NXwRXaoWzVaANR
O/hm1LHM4P0DFAqwq1kvSh6VLpBUrZNyhN61cegpoJVeQp2Vb6Wbyxfb6XIDdPpSEeT9
x2YA==
Precedence: bulk
List-Post: <mailto:gentoo-portage-dev@lists.gentoo.org>
List-Help: <mailto:gentoo-portage-dev+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-portage-dev+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-portage-dev+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-portage-dev.gentoo.org>
X-BeenThere: gentoo-portage-dev@lists.gentoo.org
Reply-to: gentoo-portage-dev@lists.gentoo.org
MIME-Version: 1.0
X-Received: by 10.112.85.3 with SMTP id d3mr301479lbz.33.1436903794464; Tue,
14 Jul 2015 12:56:34 -0700 (PDT)
Sender: zmedico@gmail.com
Received: by 10.114.182.47 with HTTP; Tue, 14 Jul 2015 12:56:34 -0700 (PDT)
In-Reply-To: <1436903543-30162-1-git-send-email-zmedico@gentoo.org>
References: <1436377602-10820-2-git-send-email-etienne.buira@gmail.com>
<1436903543-30162-1-git-send-email-zmedico@gentoo.org>
Date: Tue, 14 Jul 2015 12:56:34 -0700
X-Google-Sender-Auth: Lvkw2WrTD00-Lp-Lrg_zhPRf5G8
Message-ID: <CAMiTYSr5Yexh0F0dYEk6YQBnu-o0QcQHTGUj+=zf-cmZ4C91Gg@mail.gmail.com>
Subject: [gentoo-portage-dev] Re: [PATCH] RsyncSync: don't pass None sync-rsync-extra-opts value
into shlex_split
From: Zac Medico <zmedico@gentoo.org>
To: gentoo-portage-dev@lists.gentoo.org
Content-Type: text/plain; charset=UTF-8
X-Archives-Salt: 1b9d0b13-b900-4391-8fd2-1565040ccba1
X-Archives-Hash: 547c340128882d6db7bc2c17554f6e17
On Tue, Jul 14, 2015 at 12:52 PM, Zac Medico <zmedico@gentoo.org> 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?