From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1C0661382C5 for ; Tue, 20 Feb 2018 02:27:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 405F3E0DB9; Tue, 20 Feb 2018 02:27:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 1A057E0DB9 for ; Tue, 20 Feb 2018 02:27:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 33B6D335C0C for ; Tue, 20 Feb 2018 02:27:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 52859216 for ; Tue, 20 Feb 2018 02:27:51 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1519093656.f9a259f9f4b69644eed30f46955b77aaf2aa97fc.blueness@gentoo> Subject: [gentoo-commits] proj/grss:master commit in: grs/ X-VCS-Repository: proj/grss X-VCS-Files: grs/Synchronize.py X-VCS-Directories: grs/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: f9a259f9f4b69644eed30f46955b77aaf2aa97fc X-VCS-Branch: master Date: Tue, 20 Feb 2018 02:27:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e621217b-67da-4f0f-ba41-5b2c0f351868 X-Archives-Hash: 0b1122cee5abb64de7208e7ab12d423b commit: f9a259f9f4b69644eed30f46955b77aaf2aa97fc Author: Anthony G. Basile gentoo org> AuthorDate: Tue Feb 20 02:27:14 2018 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Tue Feb 20 02:27:36 2018 +0000 URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=f9a259f9 grs/Synchronize.py: improve 'git submodule update' command grs/Synchronize.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/grs/Synchronize.py b/grs/Synchronize.py index be41bd6..da38285 100644 --- a/grs/Synchronize.py +++ b/grs/Synchronize.py @@ -50,11 +50,8 @@ class Synchronize(): # If there is a .gitmodules, then init/update the submodules git_modulesfile = os.path.join(self.local_repo, '.gitmodules') if os.path.isfile(git_modulesfile): - # This may re-init submodules, but its harmless. We need - # to keep trying for newly added modules. - cmd = 'git -C %s submodule init' % self.local_repo - Execute(cmd, timeout=60, logfile=self.logfile) - cmd = 'git -C %s submodule update --remote' % self.local_repo + # Recursively update any submodules following the remote branch + cmd = 'git -C %s submodule update --init --recursive --remote' % self.local_repo Execute(cmd, timeout=60, logfile=self.logfile)