edkrepo_manifest_parser/edk_manifest.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
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
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#59716): https://edk2.groups.io/g/devel/message/59716
Mute This Topic: https://groups.io/mt/74261598/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
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
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#59731): https://edk2.groups.io/g/devel/message/59731
Mute This Topic: https://groups.io/mt/74261598/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
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
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#59732): https://edk2.groups.io/g/devel/message/59732
Mute This Topic: https://groups.io/mt/74261598/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2024 Red Hat, Inc.