* [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fixed submodule attribute in pin files
@ 2020-05-17 0:37 Bjorge, Erik C
2020-05-18 2:09 ` [edk2-devel] " Nate DeSimone
2020-05-18 2:11 ` Nate DeSimone
0 siblings, 2 replies; 3+ messages in thread
From: Bjorge, Erik C @ 2020-05-17 0:37 UTC (permalink / raw)
To: devel
Cc: Ashley E Desimone, Nate DeSimone, Puja Pandya, Bret Barkelew,
Prince Agyeman
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fixed submodule attribute in pin files
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 ` Nate DeSimone
2020-05-18 2:11 ` Nate DeSimone
1 sibling, 0 replies; 3+ messages in thread
From: Nate DeSimone @ 2020-05-18 2:09 UTC (permalink / raw)
To: devel@edk2.groups.io, Bjorge, Erik C
Cc: Desimone, Ashley E, Pandya, Puja, Bret Barkelew, Agyeman, Prince
Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
> -----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
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fixed submodule attribute in pin files
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
1 sibling, 0 replies; 3+ messages in thread
From: Nate DeSimone @ 2020-05-18 2:11 UTC (permalink / raw)
To: devel@edk2.groups.io, Bjorge, Erik C
Cc: Desimone, Ashley E, Pandya, Puja, Bret Barkelew, Agyeman, Prince
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
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-18 2:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox