andykimpe / rpms / 389-ds-base

Forked from rpms/389-ds-base 5 months ago
Clone

Blame SOURCES/0085-Ticket-49576-Add-support-of-deletedattribute-in-ds-r.patch

3b7e51
From 00ebe4e4298fb19d9b8fc78b16053fb0b92eea9f Mon Sep 17 00:00:00 2001
3b7e51
From: Mark Reynolds <mreynolds@redhat.com>
3b7e51
Date: Fri, 25 May 2018 09:47:31 -0400
3b7e51
Subject: [PATCH] Ticket 49576 - Add support of ";deletedattribute" in
3b7e51
 ds-replcheck
3b7e51
3b7e51
Description: Also need to check for ";deletedattribute" when processing LDIF file
3b7e51
3b7e51
https://pagure.io/389-ds-base/issue/49576
3b7e51
3b7e51
Reviewed by: tbordaz(Thanks!)
3b7e51
3b7e51
(cherry picked from commit 9e046a35a0f771e77c788cddee2cbddee6ae0571)
3b7e51
---
3b7e51
 ldap/admin/src/scripts/ds-replcheck | 2 +-
3b7e51
 1 file changed, 1 insertion(+), 1 deletion(-)
3b7e51
3b7e51
diff --git a/ldap/admin/src/scripts/ds-replcheck b/ldap/admin/src/scripts/ds-replcheck
3b7e51
index b801ccaa8..661c9e0ce 100755
3b7e51
--- a/ldap/admin/src/scripts/ds-replcheck
3b7e51
+++ b/ldap/admin/src/scripts/ds-replcheck
3b7e51
@@ -197,7 +197,7 @@ def remove_attr_state_info(attr):
3b7e51
     idx = attr.find(';')
3b7e51
     if idx > 0:
3b7e51
         state_attr = attr  # preserve state info for diff report
3b7e51
-        if ";deleted" in attr:
3b7e51
+        if ";deleted" in attr or ";deletedattribute" in attr:
3b7e51
             # Ignore this attribute it was deleted
3b7e51
             return None, state_attr
3b7e51
         attr = attr[:idx]
3b7e51
-- 
3b7e51
2.17.0
3b7e51