amoralej / rpms / 389-ds-base

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

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

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