From patchwork Tue Mar 5 15:35:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Johannes_L=C3=B6thberg?= X-Patchwork-Id: 1022 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 5018FC28068B for ; Tue, 5 Mar 2019 15:35:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on apollo X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00=-1,DKIM_SIGNED=0.1, DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,MAILING_LIST_MULTI=-1, RCVD_IN_DNSWL_MED=-2.3,T_DMARC_POLICY_NONE=0.01 autolearn=ham autolearn_force=no version=3.4.2 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Tue, 5 Mar 2019 15:35:24 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 111EE1107B8972; Tue, 5 Mar 2019 15:35:23 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS; Tue, 5 Mar 2019 15:35:22 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id C30D02C5F7; Tue, 5 Mar 2019 15:35:22 +0000 (UTC) Authentication-Results: luna.archlinux.org; dkim=pass (1024-bit key) header.d=kyriasis.com header.i=@kyriasis.com header.b=U9a7e/OU Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 915CF2C524 for ; Tue, 5 Mar 2019 15:35:18 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by luna.archlinux.org (Postfix) with ESMTPS for ; Tue, 5 Mar 2019 15:35:18 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 578871107B896E for ; Tue, 5 Mar 2019 15:35:14 +0000 (UTC) Received: from theos.kyriasis.com (theos.kyriasis.com [IPv6:2a01:7e00:e000:136::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS for ; Tue, 5 Mar 2019 15:35:14 +0000 (UTC) Received: from theos.kyriasis.com (localhost [127.0.0.1]) by theos.kyriasis.com (OpenSMTPD) with ESMTP id 13a32663 for ; Tue, 5 Mar 2019 15:35:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=kyriasis.com; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=theos; bh=3JGX52PIh9OowPlyApAyuCci lpQ=; b=U9a7e/OUR6MaY8GCPORra2m3FLHg2RRlIyVw3dTtCpVPd1iqJ1KT9Zzw IU3K+OHTb0Cr1x1bPJ4Q83B3ZxWln1nElqZ2ffCiLStvxZYwAtFRspcLd8upRhUz NY+ZAIRdljEGhJ+R8rzL5v8//niB2NV/syT1+tiBucrh2JTCB7A= DomainKey-Signature: a=rsa-sha1; c=nofws; d=kyriasis.com; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; q=dns; s=theos; b=az+kHMZZWH1EG3AWSa YYnTTM3rsHM3C3owswpWAgSpJ7nVNkFiSraXAKu0rgGNWHRuP24rcUnrMMWFo6X9 4EQVUUmJCD/uWkfLS5Rg61hPSE0rKFpB2pDrGGrkT0kvALwE7f7Sfo+nDmPpEAp/ 3BTfAcYhFoKS5zbZ7fiXFfjbI= Received: from hydrogen.kyriasis.com (h-52-10.A572.priv.bahnhof.se [158.174.52.10]) by theos.kyriasis.com (OpenSMTPD) with ESMTPSA id 77a5b905 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Tue, 5 Mar 2019 15:35:07 +0000 (UTC) From: =?utf-8?q?Johannes_L=C3=B6thberg?= To: aur-dev@archlinux.org Subject: [PATCH] git/update: Fix exception on encountering non-blob type Date: Tue, 5 Mar 2019 16:35:02 +0100 Message-Id: <20190305153502.5132-1-johannes@kyriasis.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-BeenThere: aur-dev@archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Arch User Repository \(AUR\) Development" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Johannes_L=C3=B6thberg?= Errors-To: aur-dev-bounces@archlinux.org Sender: "aur-dev" Signed-off-by: Johannes Löthberg --- aurweb/git/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aurweb/git/update.py b/aurweb/git/update.py index 39128f8..5228abc 100755 --- a/aurweb/git/update.py +++ b/aurweb/git/update.py @@ -284,7 +284,7 @@ def main(): str(commit.id)) if not isinstance(blob, pygit2.Blob): - die_commit("not a blob object: {:s}".format(treeobj), + die_commit("not a blob object: {:s}".format(str(treeobj.id)), str(commit.id)) if blob.size > max_blob_size: