You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2019/06/06 19:46:23 UTC

[lucene-solr] branch branch_8x updated: LUCENE-8818: Fix smokeTestRelease.py encoding bug

This is an automated email from the ASF dual-hosted git repository.

janhoy pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8x by this push:
     new 8a48847  LUCENE-8818: Fix smokeTestRelease.py encoding bug
8a48847 is described below

commit 8a488478f093e99a7168f30b56392ddef080b276
Author: Jan Høydahl <ja...@apache.org>
AuthorDate: Thu Jun 6 21:42:24 2019 +0200

    LUCENE-8818: Fix smokeTestRelease.py encoding bug
    
    (cherry picked from commit 8d6fd7298fe480a627db333eafeadc7b6a8fdcad)
---
 dev-tools/scripts/smokeTestRelease.py | 8 ++++----
 lucene/CHANGES.txt                    | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.py
index a6f0990..614a941 100644
--- a/dev-tools/scripts/smokeTestRelease.py
+++ b/dev-tools/scripts/smokeTestRelease.py
@@ -375,7 +375,7 @@ def checkSigs(project, urlString, version, tmpDir, isSigned, keysFile):
       run('gpg --homedir %s --verify %s %s' % (gpgHomeDir, sigFile, artifactFile),
           logFile)
       # Forward any GPG warnings, except the expected one (since it's a clean world)
-      f = open(logFile, encoding='UTF-8')
+      f = open(logFile)
       for line in f.readlines():
         if line.lower().find('warning') != -1 \
         and line.find('WARNING: This key is not certified with a trusted signature') == -1:
@@ -389,7 +389,7 @@ def checkSigs(project, urlString, version, tmpDir, isSigned, keysFile):
       logFile = '%s/%s.%s.gpg.trust.log' % (tmpDir, project, artifact)
       run('gpg --verify %s %s' % (sigFile, artifactFile), logFile)
       # Forward any GPG warnings:
-      f = open(logFile, encoding='UTF-8')
+      f = open(logFile)
       for line in f.readlines():
         if line.lower().find('warning') != -1:
           print('      GPG: %s' % line.strip())
@@ -1120,7 +1120,7 @@ def verifyMavenSigs(baseURL, tmpDir, artifacts, keysFile):
       run('gpg --homedir %s --verify %s %s' % (gpgHomeDir, sigFile, artifactFile),
           logFile)
       # Forward any GPG warnings, except the expected one (since it's a clean world)
-      f = open(logFile, encoding='UTF-8')
+      f = open(logFile)
       for line in f.readlines():
         if line.lower().find('warning') != -1 \
            and line.find('WARNING: This key is not certified with a trusted signature') == -1 \
@@ -1134,7 +1134,7 @@ def verifyMavenSigs(baseURL, tmpDir, artifacts, keysFile):
       logFile = '%s/%s.%s.gpg.trust.log' % (tmpDir, project, artifact)
       run('gpg --verify %s %s' % (sigFile, artifactFile), logFile)
       # Forward any GPG warnings:
-      f = open(logFile, encoding='UTF-8')
+      f = open(logFile)
       for line in f.readlines():
         if line.lower().find('warning') != -1 \
            and line.find('WARNING: This key is not certified with a trusted signature') == -1 \
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 65e94e5..2954557 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -41,6 +41,8 @@ Improvements
   multiple threads, IndexSearcher now groups small segments together, up to
   250k docs per slice. (Atri Sharma via Adrien Grand)
 
+* LUCENE-8818: Fix smokeTestRelease.py encoding bug (janhoy)
+
 ======================= Lucene 8.1.1 =======================
 (No Changes)