From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web12.1755.1575424236325162616 for ; Tue, 03 Dec 2019 17:50:36 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: ashley.e.desimone@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Dec 2019 17:50:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,275,1571727600"; d="scan'208";a="385555736" Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga005.jf.intel.com with ESMTP; 03 Dec 2019 17:50:35 -0800 From: "Desimone, Ashley E" To: devel@edk2.groups.io Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Improve output formatting in maintain_submodules() Date: Tue, 3 Dec 2019 17:50:31 -0800 Message-Id: <20191204015031.41268-1-ashley.e.desimone@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 Signed-off-by: Ashley E Desimone --- edkrepo/common/common_repo_functions.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/edkrepo/common/common_repo_functions.py b/edkrepo/common/common_repo_functions.py index c8713dd..d857d09 100644 --- a/edkrepo/common/common_repo_functions.py +++ b/edkrepo/common/common_repo_functions.py @@ -201,26 +201,26 @@ def write_conditional_include(workspace_path, repo_sources, included_configs): def maintain_submodules(repo_sources, repo, verbose = False): try: output_data = repo.git.execute(['git', 'submodule', 'init'], with_extended_output=True, with_stdout=True) - if verbose: + if verbose and output_data[0]: print(output_data[0]) - print(output_data[1]) - if verbose: + if output_data[1]: + print(output_data[1]) + if verbose and output_data[2]: print(output_data[2]) - print() output_data = repo.git.execute(['git', 'submodule', 'sync', '--recursive'], with_extended_output=True, with_stdout=True) - if verbose: + if verbose and output_data[0]: print(output_data[0]) - print(output_data[1]) - if verbose: + if output_data[1]: + print(output_data[1]) + if verbose and output_data[2]: print(output_data[2]) - print() output_data = repo.git.execute(['git', 'submodule', 'update', '--recursive'], with_extended_output=True, with_stdout=True) - if verbose: + if verbose and output_data[0]: print(output_data[0]) - print(output_data[1]) - if verbose: + if output_data[1]: + print(output_data[1]) + if verbose and output_data[2]: print(output_data[2]) - print() except: raise EdkrepoGitException(SUBMODULE_FAILURE.format(repo_sources.remote_name)) -- 2.16.2.windows.1