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 6FFEF138D19 for ; Tue, 14 Jul 2015 19:52:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9361BE0867; Tue, 14 Jul 2015 19:52:49 +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 1BF4CE0857 for ; Tue, 14 Jul 2015 19:52:49 +0000 (UTC) Received: from x51r2.ad.gaikai.biz (unknown [100.42.98.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: zmedico) by smtp.gentoo.org (Postfix) with ESMTPSA id D3204340A67; Tue, 14 Jul 2015 19:52:47 +0000 (UTC) From: Zac Medico To: gentoo-portage-dev@lists.gentoo.org Cc: Zac Medico Subject: [gentoo-portage-dev] [PATCH] RsyncSync: don't pass None sync-rsync-extra-opts value into shlex_split Date: Tue, 14 Jul 2015 12:52:23 -0700 Message-Id: <1436903543-30162-1-git-send-email-zmedico@gentoo.org> X-Mailer: git-send-email 2.3.6 In-Reply-To: <1436377602-10820-2-git-send-email-etienne.buira@gmail.com> References: <1436377602-10820-2-git-send-email-etienne.buira@gmail.com> 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 X-Archives-Salt: 0f85945b-96cb-48f9-aa99-07b0ce4b4fa4 X-Archives-Hash: 5110db4134dd3f7e02b1fb9923d43648 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