From ed8f13e98ddbafcb1922e98b915b0b3aebc3b971 Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Tue, 15 Nov 2022 18:22:07 +0000 Subject: [PATCH] Debian: Fix makePatch delta-dir handling The delta-dir was not being found during patch generation. This was because the code to detect initramfs here: https://review.opendev.org/c/starlingx/update/+/861184 was changing to a different directory, so delta-dir was being created in a patch_work directory, and was not able to be included in the patch. Test Plan: PASS: python make_patch.py --create Story: 2008862 Task: 46731 Signed-off-by: Al Bailey Change-Id: Ide73f4a2dea1945f987cb36fae818bd1973706f9 --- sw-patch/cgcs-patch/cgcs_make_patch/make_patch.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sw-patch/cgcs-patch/cgcs_make_patch/make_patch.py b/sw-patch/cgcs-patch/cgcs_make_patch/make_patch.py index 33fe384f..87209116 100644 --- a/sw-patch/cgcs-patch/cgcs_make_patch/make_patch.py +++ b/sw-patch/cgcs-patch/cgcs_make_patch/make_patch.py @@ -509,6 +509,8 @@ class PatchBuilder(object): clone_dir = os.path.join(self.deploy_dir, clone_dir) + os.chdir(self.deploy_dir) + # self.delta_dir is 'relative' to self.deploy_dir if os.path.isdir(self.delta_dir): log.error("Delta dir exists '%s', clean it up and try again", self.delta_dir) exit(1)