From: "Nate DeSimone" <nathaniel.l.desimone@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"Bjorge, Erik C" <erik.c.bjorge@intel.com>
Cc: "Desimone, Ashley E" <ashley.e.desimone@intel.com>,
"Pandya, Puja" <puja.pandya@intel.com>,
Bret Barkelew <Bret.Barkelew@microsoft.com>,
"Agyeman, Prince" <prince.agyeman@intel.com>
Subject: Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fixed submodule attribute in pin files
Date: Mon, 18 May 2020 02:11:03 +0000 [thread overview]
Message-ID: <BYAPR11MB34966BFE51A3AD0CEE3BFC8FCDB80@BYAPR11MB3496.namprd11.prod.outlook.com> (raw)
In-Reply-To: <3674cec3c9e2a64934546a4ea8db02907ebeb417.1589675752.git.erik.c.bjorge@intel.com>
Pushed: 4d8b3dbe
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Bjorge,
> Erik C
> Sent: Saturday, May 16, 2020 5:37 PM
> To: devel@edk2.groups.io
> Cc: Desimone, Ashley E <ashley.e.desimone@intel.com>; Desimone,
> Nathaniel L <nathaniel.l.desimone@intel.com>; Pandya, Puja
> <puja.pandya@intel.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>;
> Agyeman, Prince <prince.agyeman@intel.com>
> Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fixed
> submodule attribute in pin files
>
> When creating pin files the manifest parser added the incorrect attribute to
> the repo source tag. This resulted in submodules always being disabled in pin
> files.
>
> Signed-off-by: Erik Bjorge <erik.c.bjorge@intel.com>
> Cc: Ashley E Desimone <ashley.e.desimone@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Puja Pandya <puja.pandya@intel.com>
> Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> Cc: Prince Agyeman <prince.agyeman@intel.com>
> Cc: Erik Bjorge <erik.c.bjorge@intel.com>
> ---
> edkrepo_manifest_parser/edk_manifest.py | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/edkrepo_manifest_parser/edk_manifest.py
> b/edkrepo_manifest_parser/edk_manifest.py
> index 02d4620..adf6d52 100644
> --- a/edkrepo_manifest_parser/edk_manifest.py
> +++ b/edkrepo_manifest_parser/edk_manifest.py
> @@ -534,7 +534,7 @@ class ManifestXml(BaseXmlHelper):
> 'branch': src_tuple.branch,
> 'commit': src_tuple.commit,
> 'sparseCheckout': sparse,
> - 'enable_submodule': sub,
> +
> + 'enableSubmodule': sub,
> 'tag': src_tuple.tag})
> else:
> elem = ET.SubElement(source_root, 'Source', {'localRoot':
> src_tuple.root, @@ -542,20 +542,20 @@ class ManifestXml(BaseXmlHelper):
> 'branch': src_tuple.branch,
> 'commit': src_tuple.commit,
> 'sparseCheckout': sparse,
> - 'enable_submodule': sub})
> +
> + 'enableSubmodule': sub})
> elif src_tuple.branch is None and src_tuple.tag:
> elem = ET.SubElement(source_root, 'Source', {'localRoot':
> src_tuple.root,
> 'remote': src_tuple.remote_name,
> 'commit': src_tuple.commit,
> 'sparseCheckout': sparse,
> - 'enable_submodule': sub,
> +
> + 'enableSubmodule': sub,
> 'tag': src_tuple.tag})
> elif src_tuple.branch is None and src_tuple.tag is None:
> elem = ET.SubElement(source_root, 'Source', {'localRoot':
> src_tuple.root,
> 'remote': src_tuple.remote_name,
> 'commit': src_tuple.commit,
> 'sparseCheckout': sparse,
> - 'enable_submodule': sub})
> +
> + 'enableSubmodule': sub})
> else:
> raise ValueError('Pin.xml cannot be generated with an empty
> commit value')
>
> --
> 2.21.0.windows.1
>
>
>
prev parent reply other threads:[~2020-05-18 2:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-17 0:37 [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fixed submodule attribute in pin files Bjorge, Erik C
2020-05-18 2:09 ` [edk2-devel] " Nate DeSimone
2020-05-18 2:11 ` Nate DeSimone [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BYAPR11MB34966BFE51A3AD0CEE3BFC8FCDB80@BYAPR11MB3496.namprd11.prod.outlook.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox