From 287539ed4ab3923cba4a901c5c2b4f569d144553 Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Tue, 5 Apr 2022 16:04:14 +0200 Subject: [PATCH] CHDO: Avoid double pull and fix uninstall (#5439) Change documents left a diff when pulled once that would go away after second pull. In debugging warning CD 763 could be seen "No TADIR entry found'. The `tadir` entry is now created properly. Uninstall would fail with "Function group ... does not exist". Reason was that the function group was already deleted by `chdo` object. The deletion of such generated function groups is now skipped. Co-authored-by: Lars Hvam --- src/objects/zcl_abapgit_object_chdo.clas.abap | 2 ++ src/objects/zcl_abapgit_object_fugr.clas.abap | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/objects/zcl_abapgit_object_chdo.clas.abap b/src/objects/zcl_abapgit_object_chdo.clas.abap index 3ae1920f4..89da62e5e 100644 --- a/src/objects/zcl_abapgit_object_chdo.clas.abap +++ b/src/objects/zcl_abapgit_object_chdo.clas.abap @@ -275,6 +275,8 @@ CLASS zcl_abapgit_object_chdo IMPLEMENTATION. INSERT tcdobts FROM TABLE ls_change_object-objects_text. INSERT tcdrps FROM TABLE ls_change_object-reports_generated. + tadir_insert( iv_package ). + after_import( ). corr_insert( iv_package ). diff --git a/src/objects/zcl_abapgit_object_fugr.clas.abap b/src/objects/zcl_abapgit_object_fugr.clas.abap index 5f9338290..dfe92fd6c 100644 --- a/src/objects/zcl_abapgit_object_fugr.clas.abap +++ b/src/objects/zcl_abapgit_object_fugr.clas.abap @@ -1054,6 +1054,12 @@ CLASS zcl_abapgit_object_fugr IMPLEMENTATION. DATA: lv_area TYPE rs38l-area, lt_includes TYPE ty_sobj_name_tt. + " FUGR related to change documents will be deleted by CHDO + SELECT SINGLE fgrp FROM tcdrps INTO lv_area WHERE fgrp = ms_item-obj_name. + IF sy-subrc = 0. + RETURN. + ENDIF. + lt_includes = includes( ). lv_area = ms_item-obj_name.