File nut-python3.patch of Package nut - j0ke.net Open Build Service

File nut-python3.patch of Package nut (Revision 8159cddbbbe594e3c68152b82b62fe27)

Currently displaying revision 8159cddbbbe594e3c68152b82b62fe27, show latest

--- autogen.sh.orig	2020-06-24 23:12:27.109695398 +0200
+++ autogen.sh	2020-06-24 23:13:21.502288914 +0200
@@ -6,7 +6,7 @@
 # re-generate files needed by configure, and created otherwise at 'dist' time
 if [ ! -f scripts/augeas/nutupsconf.aug.in ]
 then
-	if python -c "import re,glob,codecs"; then
+	if python3 -c "import re,glob,codecs"; then
 		echo "Regenerating Augeas ups.conf lens..."
 		cd scripts/augeas && {
 			./gen-nutupsconf-aug.py || exit 1
@@ -14,7 +14,7 @@
 		}
 	else
 		echo "----------------------------------------------------------------------"
-		echo "Error: Python is not available."
+		echo "Error: Python3 is not available."
 		echo "Unable to regenerate Augeas ups.conf lens."
 		echo "----------------------------------------------------------------------"
 		exit 1
--- scripts/augeas/gen-nutupsconf-aug.py.orig	2020-06-24 23:14:09.990289656 +0200
+++ scripts/augeas/gen-nutupsconf-aug.py	2020-06-24 23:14:20.346290466 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #   Copyright (C) 2010 - Arnaud Quette <arnaud.quette@gmail.com>
 #
 #   This program is free software; you can redistribute it and/or modify
--- ./tools/gitlog2changelog.py.orig	2020-06-24 23:23:42.310626145 +0200
+++ ./tools/gitlog2changelog.py	2020-06-24 23:23:54.974626228 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2008 Marcus D. Hanwell <marcus@cryos.org>
 # Minor changes for NUT by Charles Lepple
 # Distributed under the terms of the GNU General Public License v2 or later
--- ./tools/nut-snmpinfo.py.orig	2020-06-24 23:23:35.654626962 +0200
+++ ./tools/nut-snmpinfo.py	2020-06-24 23:24:06.022625839 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #   Copyright (C) 2011-2019 Eaton
 # 		Authors:	Frederic Bohe <FredericBohe@Eaton.com>
 #   				Arnaud Quette <ArnaudQuette@Eaton.com>
--- tools/Makefile.am.orig	2020-06-24 23:39:09.103001606 +0200
+++ tools/Makefile.am	2020-06-24 23:39:22.971001606 +0200
@@ -40,7 +40,7 @@
 nut-scanner-deps-usb: $(GENERATED_USB_FILES)
 
 $(GENERATED_SNMP_FILES): $(top_srcdir)/drivers/*-mib.c
-	@if python -c 1; then \
+	@if python3 -c 1; then \
 		echo "Regenerating the SNMP helper files in SRC dir."; \
 		TOP_SRCDIR="$(top_srcdir)" ; export TOP_SRCDIR; \
 		TOP_BUILDDIR="$(top_builddir)" ; export TOP_BUILDDIR; \
@@ -73,7 +73,7 @@
 # so it may write the files in "dist" case (read-only sources), but the script
 # is called from the distdir where its copy is present.
 dist-hook:
-	@if python -c 1; then \
+	@if python3 -c 1; then \
 		echo "Regenerating the SNMP helper files in DIST dir."; \
 		TOP_SRCDIR="$(top_srcdir)" ; export TOP_SRCDIR; \
 		TOP_BUILDDIR="$(top_builddir)" ; export TOP_BUILDDIR; \