Simone Tiraboschi has uploaded a new change for review.

Change subject: packaging: setup: avoid duplicate keys in answerfile
......................................................................

packaging: setup: avoid duplicate keys in answerfile

Avoiding duplicate keys in answerfile.

Change-Id: I96504ec0fc6112dfeb539294f84ce2294d1b2850
Bug-Url: https://bugzilla.redhat.com/1118335
Signed-off-by: Simone Tiraboschi <stira...@redhat.com>
---
M packaging/setup/plugins/ovirt-engine-common/base/core/answerfile.py
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/32654/1

diff --git 
a/packaging/setup/plugins/ovirt-engine-common/base/core/answerfile.py 
b/packaging/setup/plugins/ovirt-engine-common/base/core/answerfile.py
index 1c52a09..fd6db9e 100644
--- a/packaging/setup/plugins/ovirt-engine-common/base/core/answerfile.py
+++ b/packaging/setup/plugins/ovirt-engine-common/base/core/answerfile.py
@@ -90,6 +90,7 @@
                         )
                     )
                     consts = []
+                    wlist = []
                     for constobj in self.environment[
                         osetupcons.CoreEnv.SETUP_ATTRS_MODULES
                     ]:
@@ -99,7 +100,10 @@
                             if hasattr(k, '__osetup_attrs__'):
                                 if k.__osetup_attrs__['answerfile']:
                                     k = k.fget(None)
-                                    if k in self.environment:
+                                    if (
+                                        k in self.environment and
+                                        k not in wlist
+                                    ):
                                         v = self.environment[k]
                                         f.write(
                                             '%s=%s:%s\n' % (
@@ -110,6 +114,7 @@
                                                 else v,
                                             )
                                         )
+                                        wlist.append(k)
 
             except IOError as e:
                 self.logger.warning(


-- 
To view, visit http://gerrit.ovirt.org/32654
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I96504ec0fc6112dfeb539294f84ce2294d1b2850
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Simone Tiraboschi <stira...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to