Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kafka-kit for openSUSE:Factory checked in at 2023-04-25 16:42:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kafka-kit (Old) and /work/SRC/openSUSE:Factory/.kafka-kit.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kafka-kit" Tue Apr 25 16:42:39 2023 rev:4 rq:1082692 version:2.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kafka-kit/kafka-kit.changes 2022-02-11 23:08:40.890819635 +0100 +++ /work/SRC/openSUSE:Factory/.kafka-kit.new.1533/kafka-kit.changes 2023-04-25 16:43:33.378488973 +0200 @@ -1,0 +2,6 @@ +Fri Apr 21 07:57:22 UTC 2023 - Max Lin <[email protected]> + +- Port runant.py to python3 + * Add kafka-kit-port-py3-runant.patch + +------------------------------------------------------------------- New: ---- kafka-kit-port-py3-runant.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kafka-kit.spec ++++++ --- /var/tmp/diff_new_pack.qOVMZB/_old 2023-04-25 16:43:35.230499873 +0200 +++ /var/tmp/diff_new_pack.qOVMZB/_new 2023-04-25 16:43:35.242499944 +0200 @@ -34,6 +34,7 @@ Source0: %{name}.tar.xz Source1: %{name}-rpmlintrc Source2: README.updating +Patch0: kafka-kit-port-py3-runant.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: x86_64 BuildRequires: fdupes @@ -52,6 +53,7 @@ %prep %setup -q -n kit +%patch0 -p1 %build # nothing to do, precompiled by design ++++++ kafka-kit-port-py3-runant.patch ++++++ --- a/apache-ant-1.9.7/bin/runant.py +++ b/apache-ant-1.9.7/bin/runant.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. @@ -36,7 +36,7 @@ debug = 0 ####################################################################### # If ANT_HOME is not set default to script's parent directory -if os.environ.has_key('ANT_HOME'): +if 'ANT_HOME' in os.environ: ANT_HOME = os.environ['ANT_HOME'] else: ANT_HOME = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0]))) @@ -46,17 +46,17 @@ ANT_LIB = os.path.join(ANT_HOME, 'lib') # set JAVACMD (check variables JAVACMD and JAVA_HOME) JAVACMD = None -if not os.environ.has_key('JAVACMD'): - if os.environ.has_key('JAVA_HOME'): +if 'JAVACMD' not in os.environ: + if 'JAVA_HOME' in os.environ: if not os.path.exists(os.environ['JAVA_HOME']): - print "Warning: JAVA_HOME is not defined correctly." + print("Warning: JAVA_HOME is not defined correctly.") else: JAVA_HOME = os.environ['JAVA_HOME'] while JAVA_HOME[0] == JAVA_HOME[-1] == "\"": JAVA_HOME = JAVA_HOME[1:-1] JAVACMD = os.path.join(JAVA_HOME, 'bin', 'java') else: - print "Warning: JAVA_HOME not set." + print("Warning: JAVA_HOME not set.") else: JAVACMD = os.environ['JAVACMD'] if not JAVACMD: @@ -64,28 +64,28 @@ if not JAVACMD: launcher_jar = os.path.join(ANT_LIB, 'ant-launcher.jar') if not os.path.exists(launcher_jar): - print 'Warning: Unable to locate ant-launcher.jar. Expected to find it in %s' % \ - ANT_LIB + print('Warning: Unable to locate ant-launcher.jar. Expected to find it in %s' % \ + ANT_LIB) # Build up standard classpath (LOCALCLASSPATH) LOCALCLASSPATH = launcher_jar -if os.environ.has_key('LOCALCLASSPATH'): +if 'LOCALCLASSPATH' in os.environ: LOCALCLASSPATH += os.pathsep + os.environ['LOCALCLASSPATH'] ANT_OPTS = "" -if os.environ.has_key('ANT_OPTS'): +if 'ANT_OPTS' in os.environ: ANT_OPTS = os.environ['ANT_OPTS'] OPTS = "" -if os.environ.has_key('JIKESPATH'): +if 'JIKESPATH' in os.environ: OPTS = '-Djikes.class.path=\"%s\"' % os.environ['JIKESPATH'] ANT_ARGS = "" -if os.environ.has_key('ANT_ARGS'): +if 'ANT_ARGS' in os.environ: ANT_ARGS = os.environ['ANT_ARGS'] CLASSPATH = "" -if os.environ.has_key('CLASSPATH'): +if 'CLASSPATH' in os.environ: CLASSPATH = "-lib " + os.environ['CLASSPATH'] while JAVACMD[0] == JAVACMD[-1] == "\"": @@ -98,7 +98,7 @@ cmdline = ('"%s" %s -classpath %s -Dant. CLASSPATH, string.join(sys.argv[1:], ' ')) if debug: - print '\n%s\n\n' % (cmdline) + print('\n%s\n\n' % (cmdline)) sys.stdout.flush() # Run the biniou!
