From patchwork Wed Nov 6 15:37:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 178743 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp877291ilf; Wed, 6 Nov 2019 08:57:53 -0800 (PST) X-Google-Smtp-Source: APXvYqyE2v1LXliSIJT8yssPp0S09vYl/bya8G0jrOY/LUadvAz9iqhGnwaBps7ScDm7iox7vXiM X-Received: by 2002:a62:fb0e:: with SMTP id x14mr4620656pfm.194.1573059473758; Wed, 06 Nov 2019 08:57:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573059473; cv=none; d=google.com; s=arc-20160816; b=06aKGJqVf4si1okaIQv49+Y4i9q5Z8BBaEEW7PpJ8IkCXPSK6iSvev/Dusa7LNGzTD k1gp0hiBhVCQpzJoQ5gYdSOuFxOwh/SEb0eQvuK0X/lM/EazBrMuUHdMd294rXYZxK+6 byfathM4GXkY3nR8axJ9Qbmlo8EVYOPWaRhcQh0xOcUFS+PAd7BijWyIvo4GRA4YIqfR uA2LV0V2Ylm5MYjFUptgDpvEMUNkgFAWHU1I0u4wakFHjCk190597/LgxMrlXki0dcEE Y9KptJ9CTgTg9nSVJvVuxIzoc8PtzSGPAXXSzB9qmMEZ58gj76+4UNCyN6hQswEv8zui RslQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:references :in-reply-to:message-id:date:to:from:dkim-signature:delivered-to; bh=AJhGj0bC9P8QxrxmsVMFge/7cSdVDh5oJOD2MQOSBlI=; b=Jhq+P0oro3l+kLudbogYduIF+2tEN4k2ZCTh+podrGfLQlQflsKd0XMSLYCqfVZYyj J/INcjhUb+w+5HbIoJ1oEfBLwMinpQWL82TjY0yGK5A8yDNsEYZRR2bNb9GJPbINqODw QAYX4+w44GTwjcjuzOLgJAA0WG3dkiFK8iDVTkQLBllM9n9bA0Xp2/vwEATy+p2PE0eK juRt4UKuxyiP82OSHXl1jCw1msjqKVoivSZS2DlckWNms7P1g7NxQ2QO1Ql+XZuSRwiE P1PoUf3jKcPBv6syBz8B2a8hEV52RAJQu2beuDp9r78bd16FVcM9b/62LrwMP9b8Oxdw 9swg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@kapsi.fi header.s=20161220 header.b=NZxfSydK; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=bmw.de Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id in14si3573816pjb.63.2019.11.06.08.57.53; Wed, 06 Nov 2019 08:57:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@kapsi.fi header.s=20161220 header.b=NZxfSydK; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=bmw.de Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7938C7FA41; Wed, 6 Nov 2019 16:57:33 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail.kapsi.fi (mail.kapsi.fi [91.232.154.25]) by mail.openembedded.org (Postfix) with ESMTP id C60257F83A for ; Wed, 6 Nov 2019 15:38:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kapsi.fi; s=20161220; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=WdKLBdMNQXgkrH9y/YoNoZoDmw8PsaMOae2QwtYH6AM=; b=NZxfSydKcaSbvAX52vhJVHSA/r Rbqmy46aN3OZ7wqrkjfx0apll09mRUzIdjnX88ol99neDjrOFx6kEB7s1PVoCGIChtgOiIztkaTbR NcZ0RoYYMRGfDBgB/A04l5nBMYpOp1p8giqa66QU5PSLRg4l1xg6Zp0jffGCt0yqQqB2t0CKApAxu 6Xxkp7qDpBEFJGZwt6xxhbflymlPRK5U+0A+jO14keg3DNA1ggPB6Ds3JyrK7EgsTkKxhZgrWUg+o BttWImdyHJ0Q1uygcmzjz9VwUzqAk7CXbqniR/fnQ7LLxzIqMbfFMiLfln/x43jGfDaxlK4EUh2Xc TAESiROA==; Received: from kapsi.fi ([91.232.154.11] helo=lakka.kapsi.fi) by mail.kapsi.fi with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1iSNOa-0000A5-EY; Wed, 06 Nov 2019 17:38:56 +0200 Received: from mcfrisk by lakka.kapsi.fi with local (Exim 4.84_2) (envelope-from ) id 1iSNO5-0007Wx-Jd; Wed, 06 Nov 2019 17:38:25 +0200 From: Mikko Rapeli To: openembedded-core@lists.openembedded.org Date: Wed, 6 Nov 2019 17:37:37 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: X-Rspam-Score: 6.0 (++++++) X-Rspam-Report: Action: add header Symbol: ARC_NA(0.00) Symbol: DMARC_POLICY_SOFTFAIL(0.10) Symbol: R_SPF_NEUTRAL(0.00) Symbol: FROM_HAS_DN(0.00) Symbol: TO_DN_SOME(0.00) Symbol: MULTIPLE_UNIQUE_HEADERS(4.89) Symbol: MIME_GOOD(-0.10) Symbol: TO_MATCH_ENVRCPT_ALL(0.00) Symbol: RCPT_COUNT_THREE(0.00) Symbol: NEURAL_SPAM(0.00) Symbol: RCVD_TLS_LAST(0.00) Symbol: MID_CONTAINS_FROM(1.00) Symbol: IP_SCORE(-0.15) Symbol: FORGED_SENDER(0.30) Symbol: R_DKIM_NA(0.00) Symbol: MIME_TRACE(0.00) Symbol: ASN(0.00) Symbol: FROM_NEQ_ENVFROM(0.00) Symbol: RCVD_COUNT_TWO(0.00) Message: (SPF): spf neutral Message-ID: ef12b25a393e1c404c36a06b1e2f994b026b27bc.1573047194.git.mikko.rapeli@bmw.de X-Rspam-Status: Yes X-Rspam-Bar: ++++++ X-SA-Exim-Connect-IP: 91.232.154.11 X-SA-Exim-Mail-From: mcfrisk@kapsi.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false Subject: [OE-core] [PATCH RFC CFH][sumo 22/47] cve-update-db-native: use os.path.join instead of + 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: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Ross Burton (From OE-Core rev: 4b301030cf9cf7a981dcff85a50e915c045e3130) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/meta/cve-update-db-native.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 1.9.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index af2946b..35f7472 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb @@ -24,11 +24,11 @@ python do_populate_cve_db() { BASE_URL = "https://nvd.nist.gov/feeds/json/cve/1.0/nvdcve-1.0-" YEAR_START = 2002 - db_dir = d.getVar("DL_DIR") + '/CVE_CHECK' - db_file = db_dir + '/nvdcve_1.0.db' - json_tmpfile = db_dir + '/nvd.json.gz' + db_dir = os.path.join(d.getVar("DL_DIR"), 'CVE_CHECK') + db_file = os.path.join(db_dir, 'nvdcve_1.0.db') + json_tmpfile = os.path.join(db_dir, 'nvd.json.gz') proxy = d.getVar("https_proxy") - cve_f = open(d.getVar("TMPDIR") + '/cve_check', 'a') + cve_f = open(os.path.join(d.getVar("TMPDIR"), 'cve_check'), 'a') if not os.path.isdir(db_dir): os.mkdir(db_dir)