From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Mon, 9 Jan 2023 17:10:39 +0000 (+0100)
Subject: Formatting Export file
X-Git-Tag: 0.8.0^2~5
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=90674025d63488788092438b8c174ae8673dd0bf;p=pixelpark%2Fpp-admin-tools.git

Formatting Export file
---

diff --git a/lib/pp_admintools/app/check_ldap_dn_attributes.py b/lib/pp_admintools/app/check_ldap_dn_attributes.py
index 11c36c0..45769d9 100644
--- a/lib/pp_admintools/app/check_ldap_dn_attributes.py
+++ b/lib/pp_admintools/app/check_ldap_dn_attributes.py
@@ -12,8 +12,10 @@ from __future__ import absolute_import
 import re
 import logging
 
+from functools import cmp_to_key
+
 # Third party modules
-import yaml
+# import yaml
 
 # Own modules
 # from fb_tools.common import to_bool, is_sequence
@@ -31,7 +33,7 @@ from ..config.ldap import LdapConfiguration
 from .ldap import LdapAppError
 from .ldap import BaseLdapApplication
 
-__version__ = '0.3.1'
+__version__ = '0.3.2'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -188,9 +190,16 @@ class CheckLdapDnAttributesApplication(BaseLdapApplication):
                 LOG.debug(_("Writing export file {!r} ...").format(self.export_file))
                 with open(
                         self.export_file, 'wt', encoding='utf-8', errors='surrogateescape') as fh:
-                    yaml.dump(
-                        self.failed_entries.as_dict(pure=True), fh, explicit_start=True,
-                        default_flow_style=False, indent=2)
+                    print('---', file=fh)
+                    sorted_dns = sorted(
+                        list(self.failed_entries.keys()), key=cmp_to_key(self.compare_ldap_dns))
+                    for dn in sorted_dns:
+                        entry = self.failed_entries[dn]
+                        print("'{}':".format(dn), file=fh)
+                        for attr in entry.keys():
+                            print('  {}:'.format(attr), file=fh)
+                            for val in self.failed_entries[dn][attr]:
+                                print("  - '{}'".format(val), file=fh)
             self.exit(5)
 
         msg = _("Did not found any inconsistent entries.")