[v2] rootfs: lock undefined in corner cases, bugfix

Message ID 20230106180242.3276764-1-roberto.foglietta@linuxteam.org
State Rejected, archived
Headers show
Series [v2] rootfs: lock undefined in corner cases, bugfix | expand

Commit Message

roberto.foglietta@linuxteam.org Jan. 6, 2023, 6:02 p.m. UTC
From: "Roberto A. Foglietta" <roberto.foglietta@gmail.com>

rootfs: lock undefined in corner cases, bugfix

Signed-off-by: Roberto A. Foglietta <roberto.foglietta@gmail.com>
---
 meta/classes/rootfs.bbclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Patch

diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
index 786682d..b4785f2 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -200,11 +200,14 @@  python do_rootfs_install() {
         if (d.getVarFlag(cmd, 'isar-apt-lock') or "") == "acquire-before":
             lock = bb.utils.lockfile(d.getVar("REPO_ISAR_DIR") + "/isar.lock",
                                      shared=True)
+        else:
+            lock = ""
 
         bb.build.exec_func(cmd, d)
 
         if (d.getVarFlag(cmd, 'isar-apt-lock') or "") == "release-after":
-            bb.utils.unlockfile(lock)
+            if (lock != ""):
+                bb.utils.unlockfile(lock)
     progress_reporter.finish()
 }
 addtask rootfs_install before do_rootfs_postprocess after do_unpack