From patchwork Thu Jul 18 20:03:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 169215 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp2838721ilk; Thu, 18 Jul 2019 13:04:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqz7/Z8UE4mDnhhqZWXKYXhTQAvTSo0uDF4eWoa5dfWrSqssROVk5tlXAZmzAufnMdwAXNOC X-Received: by 2002:a63:c013:: with SMTP id h19mr19101341pgg.108.1563480247953; Thu, 18 Jul 2019 13:04:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563480247; cv=none; d=google.com; s=arc-20160816; b=K88tOy82CrL8IPA+O1bOZRsQl3gHQmLkTkudDAXlXRfFhHC3/6XNB5VsOi08rR/ZYh eBve6hbJqGpLW6d5/zhgXjjavQPgxt1qSlc4nRzTk/MWq4yx9LFlhEWfHIgku7A2LeNX c4ajBlyQc6FRf6W9j3Igdp0YxTMjd92fkS+jKteiIAh2SyvfdtHUWJoOozkhOioAkUlz vJ2fP01Kku6yT31K+hmu91EcoyTj9alFP0haj1TOaW/MxdgQz6XsZzriTl0dAmi/VcWN 3QRjElXYuKDgtTXvt5tuZCeOi3piLQNBffNl5kvC6VAiXZWxWTx3CkUbTGTPRkCVPLLn X4nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=AU6ZPLwFFdlYMNJl9Op0Gqs7yz4uRQr3hmA5xv2ai+4=; b=oSUdVAvklVKHJKr5pbWgyaXC3lEMAi8CtVy6Ag8BMuibGlqgGFmojUYlCxuwXvmTuR lmL4ZLc7GMW60HWej9tOr70nCdXbaS+alcV36YfnbzAqjQV/G7kO8s/R+xugbormVG/v 3mBVGXUmK38QgsiBYjaE6RTKb0ANKFdHfq3TWFsotNNR/gDQHEiqIxYi/vhf7rlK+sNj Au4ae3Bn4X/6ZS0HxePKMyMDpe5/B8MjVxWrqRGf64xZ4xPCpp7zztnXzjmIp4gW2s3q 8IvB45ItPR1Y6fMyGreIKRNSR6k53P5CfqFDMv9q9iICSj7r1sFmCMMQghxX3ZDfFQ/Z +5VA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b="lwsl9/7j"; 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=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id q12si1647494pgt.447.2019.07.18.13.04.07; Thu, 18 Jul 2019 13:04:07 -0700 (PDT) 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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b="lwsl9/7j"; 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=intel.com 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 620BF7F036; Thu, 18 Jul 2019 20:04:04 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mail.openembedded.org (Postfix) with ESMTP id 395157EED0 for ; Thu, 18 Jul 2019 20:04:03 +0000 (UTC) Received: by mail-wm1-f52.google.com with SMTP id v15so26762494wml.0 for ; Thu, 18 Jul 2019 13:04:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=MRY8twQbB4kLOeIAk60Sx+YuDxGOWCMZT8O+ttNJhus=; b=lwsl9/7jVpVq8ICiAqN+BigheBOiPYes9YVepv6Ac7eJgqUxAZuX2GBhN8gIXcau9k 8DvdJA+T3MGmWMA7mnliBKlnnCR6LY0QzgHDHXr7gQu2+3ZoU8cc5yC8jQYpdlr2aaMU q6O9Ll/sbpbrGr5YDGz1wgv9qDJXuzK+RI6H3JGt2r/252CNM0ybhu8CVfGBD8Z8r++t akqrY3zL/ZSQKG4HfaT3fbhcbwZ25V5dJbi3dccDbexvQhvNqPXAEWtUwPThGgeE/Rno e1HwpD/QNboPkpAduwwKUd63lWJZs0ng0EaiWISG3j5rKxWQr66zmbp8KeUSI0MLGcub 1KFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=MRY8twQbB4kLOeIAk60Sx+YuDxGOWCMZT8O+ttNJhus=; b=HKY5qyBNZWl1XkDZLuqTe3TRFYrza39e8WVTApMVs6Und8mob+EBimXgCnbIxrZFyP mRJP9Ug36knXLD0arpcN6btLenKR4UAO79Ody+RXkwbHGZbGBqhfUpRwMZkrmSvisqWJ e/2CldlFfnvHjkpl9W0TjjWz/3LTFMBuHsH6ygKY8z3APZ8tS1KAeqc7QtsURQVEApC5 8H7ZEFYvOe4DdkAnagl8R9aqx9jekLmReF36rVD61RRTsepkapeMJA4kK6ECKfRHh6BT WNGD3QRFk5XSd9+QiMuKhtjuVnDVOZeyzsXRpaW7KKFaSa8BnFccIM6PYHT2jSTcbxmj q41Q== X-Gm-Message-State: APjAAAUSCgnR60Y1D35/khb027AIIW2yh7KIEsBNkE9Nofh2sMGILS2l BDki+gQT4kwWY1G+HzjklJw8RAGdCO4= X-Received: by 2002:a1c:f409:: with SMTP id z9mr36638356wma.176.1563480243625; Thu, 18 Jul 2019 13:04:03 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id r12sm35331858wrt.95.2019.07.18.13.04.02 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 13:04:02 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 18 Jul 2019 21:03:58 +0100 Message-Id: <20190718200400.19750-1-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [OE-core] [PATCH 1/3] 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Ross Burton --- meta/recipes-core/meta/cve-update-db-native.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.20.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 3519beae5fb..9047513dbdf 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb @@ -29,11 +29,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)