[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7278/8267] rootfs-postcommands.bbclass: Prevent linking testdata to itself



commit 88a82e74899b4152fcbda9e88aa1e8e77701b5e2
Author: Mike Looijmans <mike looijmans topic nl>
Date:   Thu Aug 17 12:49:49 2017 +0200

    rootfs-postcommands.bbclass: Prevent linking testdata to itself
    
    testdata and testdata_link may point to the same file, in particular
    when IMAGE_LINK_NAME and IMAGE_NAME are equal.
    
    Check if this is the case before creating a symlink that points to
    itself and makes the next build fail.
    
    (From OE-Core rev: b516394f9e7858062aa7b042aa4a1bdef9d3a941)
    
    Signed-off-by: Mike Looijmans <mike looijmans topic nl>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/rootfs-postcommands.bbclass |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass
index 78f7c55..c92df7b 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -300,7 +300,8 @@ python write_image_test_data() {
     searchString = "%s/"%(d.getVar("TOPDIR")).replace("//","/")
     export2json(d, testdata,searchString=searchString,replaceString="")
 
-    if os.path.lexists(testdata_link):
-       os.remove(testdata_link)
-    os.symlink(os.path.basename(testdata), testdata_link)
+    if testdata_link != testdata:
+        if os.path.lexists(testdata_link):
+           os.remove(testdata_link)
+        os.symlink(os.path.basename(testdata), testdata_link)
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]