From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web11.95.1575497496026143733 for ; Wed, 04 Dec 2019 14:11:36 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: nathaniel.l.desimone@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Dec 2019 14:11:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,278,1571727600"; d="scan'208";a="263091352" Received: from orsmsx106.amr.corp.intel.com ([10.22.225.133]) by FMSMGA003.fm.intel.com with ESMTP; 04 Dec 2019 14:11:34 -0800 Received: from orsmsx114.amr.corp.intel.com ([169.254.8.67]) by ORSMSX106.amr.corp.intel.com ([169.254.1.150]) with mapi id 14.03.0439.000; Wed, 4 Dec 2019 14:11:34 -0800 From: "Nate DeSimone" To: "devel@edk2.groups.io" , "Desimone, Ashley E" CC: "Pandya, Puja" Subject: Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH V2] EdkRepo: Improve output formatting in maintain_submodules() Thread-Topic: [edk2-devel] [edk2-staging/EdkRepo] [PATCH V2] EdkRepo: Improve output formatting in maintain_submodules() Thread-Index: AQHVqkXCfUY5dC2hUU2zcJ49knyZvKeqivLg Date: Wed, 4 Dec 2019 22:11:33 +0000 Message-ID: <02A34F284D1DA44BB705E61F7180EF0AB5C16100@ORSMSX114.amr.corp.intel.com> References: <20191204015418.34060-1-ashley.e.desimone@intel.com> In-Reply-To: <20191204015418.34060-1-ashley.e.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiN2NhZDk1NGItMjU1Ni00NzMxLTlkYmMtNzMyYmIxYTQ5ZmEwIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiMDdTYkQrb05UaThId1d3OEd4XC9JN1wveTBmVVwvVWI4cFkrWXFrWk9NR0NuMkNTZXRUZHdDbm9hWjhBSXJQamgwRyJ9 x-ctpclassification: CTP_NT x-originating-ip: [10.22.254.140] MIME-Version: 1.0 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Nate DeSimone -----Original Message----- From: devel@edk2.groups.io On Behalf Of Desimone, A= shley E Sent: Tuesday, December 3, 2019 5:54 PM To: devel@edk2.groups.io Cc: Desimone, Nathaniel L ; Pandya, Puja <= puja.pandya@intel.com> Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH V2] EdkRepo: Improve o= utput formatting in maintain_submodules() Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya --- 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/comm= on_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_s= ources, included_configs): def maintain_submodules(repo_sources, repo, verbose =3D False): try: output_data =3D repo.git.execute(['git', 'submodule', 'init'], wi= th_extended_output=3DTrue, with_stdout=3DTrue) - 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 =3D repo.git.execute(['git', 'submodule', 'sync', '--= recursive'], with_extended_output=3DTrue, with_stdout=3DTrue) - 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 =3D repo.git.execute(['git', 'submodule', 'update', '= --recursive'], with_extended_output=3DTrue, with_stdout=3DTrue) - 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.r= emote_name)) =20 --=20 2.16.2.windows.1