Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3FB50200C80 for ; Thu, 11 May 2017 02:21:56 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3E516160BB4; Thu, 11 May 2017 00:21:56 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 84626160B9C for ; Thu, 11 May 2017 02:21:55 +0200 (CEST) Received: (qmail 14022 invoked by uid 500); 11 May 2017 00:21:54 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 14013 invoked by uid 99); 11 May 2017 00:21:54 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 May 2017 00:21:54 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 2D8CE812E4; Thu, 11 May 2017 00:21:52 +0000 (UTC) Date: Thu, 11 May 2017 00:21:52 +0000 To: "commits@couchdb.apache.org" Subject: [couchdb] branch upload-failed-logfiles updated: support ancient versions of requests library MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <149446211290.7419.13956704188564579429@gitbox.apache.org> From: wohali@apache.org Reply-To: "commits@couchdb.apache.org" X-Git-Host: gitbox.apache.org X-Git-Repo: couchdb X-Git-Refname: refs/heads/upload-failed-logfiles X-Git-Reftype: branch X-Git-Oldrev: a38a317ed3a11f78d3389d67690f4f4a7bdc39a2 X-Git-Newrev: a295a707dffbe34d8d1503a551b66fcd1a97e762 X-Git-Rev: a295a707dffbe34d8d1503a551b66fcd1a97e762 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.3.dev Auto-Submitted: auto-generated archived-at: Thu, 11 May 2017 00:21:56 -0000 This is an automated email from the ASF dual-hosted git repository. wohali pushed a commit to branch upload-failed-logfiles in repository https://gitbox.apache.org/repos/asf/couchdb.git The following commit(s) were added to refs/heads/upload-failed-logfiles by this push: new a295a70 support ancient versions of requests library a295a70 is described below commit a295a707dffbe34d8d1503a551b66fcd1a97e762 Author: Joan Touzet AuthorDate: Wed May 10 20:21:36 2017 -0400 support ancient versions of requests library --- build-aux/logfile-uploader.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build-aux/logfile-uploader.py b/build-aux/logfile-uploader.py index 7c11a76..4555cdc 100755 --- a/build-aux/logfile-uploader.py +++ b/build-aux/logfile-uploader.py @@ -89,11 +89,13 @@ def upload_logs(): req.raise_for_status() req = _tojson(req) with open(TARFILE, 'rb') as f: + # ancient versions of requests break if data is iterable + fdata = f.read() req2 = requests.put(COUCH_URL + '/' + doc['_id'] + '/' + TARFILE, headers={'Content-type': 'application/x-gtar'}, auth=creds, params={'rev': req['rev']}, - data=f) + data=fdata) req2.raise_for_status() return req2 -- To stop receiving notification emails like this one, please contact ['"commits@couchdb.apache.org" '].