From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from avasout02.plus.net (avasout02.plus.net [212.159.14.17]) by mail.openembedded.org (Postfix) with ESMTP id 496307ED3D for ; Mon, 15 Jul 2019 12:51:09 +0000 (UTC) Received: from deneb ([80.229.24.9]) by smtp with ESMTP id n0Rghl3R96ogsn0Rhhwlqm; Mon, 15 Jul 2019 13:51:09 +0100 X-Clacks-Overhead: "GNU Terry Pratchett" X-CM-Score: 0.00 X-CNFS-Analysis: v=2.3 cv=Y62GTSWN c=1 sm=1 tr=0 a=E/9URZZQ5L3bK/voZ0g0HQ==:117 a=E/9URZZQ5L3bK/voZ0g0HQ==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=0o9FgrsRnhwA:10 a=-An2I_7KAAAA:8 a=IR7-BfzTyPpBs7QYz2MA:9 a=Sq34B_EcNBM9_nrAYB9S:22 Received: from mac by deneb with local (Exim 4.89) (envelope-from ) id 1hn0Rf-0000ka-79; Mon, 15 Jul 2019 13:51:07 +0100 From: Mike Crowe To: openembedded-core@lists.openembedded.org Date: Mon, 15 Jul 2019 13:51:00 +0100 Message-Id: <20190715125100.14288-2-mac@mcrowe.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715125100.14288-1-mac@mcrowe.com> References: <20190715125100.14288-1-mac@mcrowe.com> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfJV2csvcPH0nBrohCT0AAyP6YOIYjd+wiONsj7aMcTaNAzJn0KGhj0g5bFNtDOYAmSnSlfiKfnCIQyfIAgmgS8pAjXj//OjbixH08qEjq8AqgCH8ZkSz nG9LaeNhhyWtx7Hpnk5U/XLgJz3d5qqGDfbbKP2b1B1+6lmyTPmvljC6 Cc: Mike Crowe , Mike Crowe Subject: [PATCH 2/2] rootfs-postcommands: Cope with empty IMAGE_LINK_NAME in write_image_test_data X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jul 2019 12:51:09 -0000 Content-Transfer-Encoding: 8bit From: Mike Crowe Ensure that we don't create an image test data symlink named ".testdata.json" when IMAGE_LINK_NAME is empty. Signed-off-by: Mike Crowe --- meta/classes/rootfs-postcommands.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index a2fe3dea2b..6cec23ef1a 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -328,7 +328,7 @@ python write_image_test_data() { searchString = "%s/"%(d.getVar("TOPDIR")).replace("//","/") export2json(d, testdata_name, searchString=searchString, replaceString="") - if os.path.exists(testdata_name): + if os.path.exists(testdata_name) and link_name: testdata_link = os.path.join(deploy_dir, "%s.testdata.json" % link_name) if os.path.lexists(testdata_link): os.remove(testdata_link) -- 2.20.1