From patchwork Wed Mar 18 15:50:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Erdmann?= X-Patchwork-Id: 451509 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id C3D451400B6 for ; Thu, 19 Mar 2015 02:51:23 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=mailerd.de header.i=@mailerd.de header.b=VONXnSVL; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DE998A3730; Wed, 18 Mar 2015 15:51:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9JQvTMQhjHod; Wed, 18 Mar 2015 15:51:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id CDFC0A3715; Wed, 18 Mar 2015 15:51:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 053821C2439 for ; Wed, 18 Mar 2015 15:51:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0309D95522 for ; Wed, 18 Mar 2015 15:51:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KbpytQZ1cIkC for ; Wed, 18 Mar 2015 15:51:05 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by hemlock.osuosl.org (Postfix) with ESMTPS id E2E9A95520 for ; Wed, 18 Mar 2015 15:51:04 +0000 (UTC) Received: by wgra20 with SMTP id a20so38879222wgr.3 for ; Wed, 18 Mar 2015 08:51:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailerd.de; s=mails; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=ZA3YSptqk73kOkNYk0DFjJQldSnQ8+hAznDscuAI1Pg=; b=VONXnSVL6NhMN5rQKlInX014BsPtHzSJqHAMfaSc46/Rlupvum0jhBs3x0pF7LqcqA 6QGEB3A3uPIbLe48QETVyTThDpk3jSXxQfEoh8eQ9e7FS2yC2xz6NE3BzuO9ZgyGTDs3 SXXXWZtpQV9wKFchqU06LOWMkd0hqzJxvzYlA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type :content-transfer-encoding; bh=ZA3YSptqk73kOkNYk0DFjJQldSnQ8+hAznDscuAI1Pg=; b=FayUoJ/chIuuA85MDd8flH6vlMPJAYkTu9GZHnju+GHMke28k8m7jdMUrXe4MHPXB9 7mkvsRUBjLhankd9HO+LEiZCc1/IZf8BiUtJD0/jUNi1mv1kiXhvwDaqmLIbtuOa7GbF DOUbP6o0PmziS++sUYzPJTygef1EBGDzz+e8bq8mzBjnFZT+4vXej0JcZeyW7xYRs+WG HQUn3ZgGi4JBBAJkCQhXe8F7jJA5m9dOwlChcP8w4e6mh/8KUBbcFC0YigO7iSOiTTyt Es20XZbczlGHHk5sNBc1SN55jhjbMJcy05pJX2sDmrikgo8EuEsNN4BNv51jhzqipX8r GMYQ== X-Gm-Message-State: ALoCoQnDMCImCdJMq9r4BLuLJRJ0vPd2tWnw9/4uoUy3AZJBZ1bnX8dSHnhtl997K6Nd/SOJH0zn X-Received: by 10.194.87.100 with SMTP id w4mr139328966wjz.65.1426693863445; Wed, 18 Mar 2015 08:51:03 -0700 (PDT) Received: from localhost.localdomain (dslb-092-074-053-028.092.074.pools.vodafone-ip.de. [92.74.53.28]) by mx.google.com with ESMTPSA id u16sm25024794wjr.5.2015.03.18.08.51.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Mar 2015 08:51:02 -0700 (PDT) From: =?UTF-8?q?Andr=C3=A9=20Erdmann?= To: buildroot@buildroot.org Date: Wed, 18 Mar 2015 16:50:37 +0100 Message-Id: <1426693843-28792-5-git-send-email-dywi@mailerd.de> X-Mailer: git-send-email 2.3.2 In-Reply-To: <1426693843-28792-1-git-send-email-dywi@mailerd.de> References: <1426693843-28792-1-git-send-email-dywi@mailerd.de> MIME-Version: 1.0 Cc: thomas.petazzoni@free-electrons.com Subject: [Buildroot] [PATCH v2 04/10] autobuild-run, python3: encode/decode mmap data X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" mmap objects return bytes in Python 3, which leads to errors when used in str context, for example: >>> fh = open("file", "r") >>> fh_mmap = mmap.mmap(fh.fileno(), 0, access=ACCESS_READ) >>> fh_mmap.find("word") TypeError: 'str' does not support the buffer interface Adds a new compat function, encode_str(), which is a no-op in Python 2. Signed-off-by: André Erdmann --- scripts/autobuild-run | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/autobuild-run b/scripts/autobuild-run index e536289..40bd657 100755 --- a/scripts/autobuild-run +++ b/scripts/autobuild-run @@ -139,12 +139,16 @@ if sys.hexversion >= 0x3000000: def decode_byte_list(bl): return [b.decode() for b in bl] + + def encode_str(s): + return s.encode() else: def _identity(e): return e decode_bytes = _identity decode_byte_list = _identity + encode_str = _identity MAX_DURATION = 60 * 60 * 4 VERSION = 1 @@ -607,10 +611,10 @@ def send_results(result, **kwargs): mf = mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ) mf.seek(0) # Search for first action on the failed package - offset = mf.find('>>> %s' % ' '.join(reason)) + offset = mf.find(encode_str('>>> %s' % ' '.join(reason))) if offset != -1: with open(resultfile, "w") as endlog: - endlog.write(mf[offset:]) + endlog.write(decode_bytes(mf[offset:])) else: # not found, use last 500 lines as fallback extract_last_500_lines()