File nut-python3.patch of Package nut (Revision 9921c1f2efd780d3dfa41f44e54a80bf)
Currently displaying revision 9921c1f2efd780d3dfa41f44e54a80bf, show latest
x
1
--- autogen.sh.orig 2020-06-24 23:12:27.109695398 +0200
2
+++ autogen.sh 2020-06-24 23:13:21.502288914 +0200
3
4
# re-generate files needed by configure, and created otherwise at 'dist' time
5
if [ ! -f scripts/augeas/nutupsconf.aug.in ]
6
then
7
- if python -c "import re,glob,codecs"; then
8
+ if python3 -c "import re,glob,codecs"; then
9
echo "Regenerating Augeas ups.conf lens..."
10
cd scripts/augeas && {
11
./gen-nutupsconf-aug.py || exit 1
12
13
}
14
else
15
echo "----------------------------------------------------------------------"
16
- echo "Error: Python is not available."
17
+ echo "Error: Python3 is not available."
18
echo "Unable to regenerate Augeas ups.conf lens."
19
echo "----------------------------------------------------------------------"
20
exit 1
21
--- scripts/augeas/gen-nutupsconf-aug.py.orig 2020-06-24 23:14:09.990289656 +0200
22
+++ scripts/augeas/gen-nutupsconf-aug.py 2020-06-24 23:14:20.346290466 +0200
23
24
-#!/usr/bin/env python
25
+#!/usr/bin/env python3
26
# Copyright (C) 2010 - Arnaud Quette <arnaud.quette@gmail.com>
27
#
28
# This program is free software; you can redistribute it and/or modify
29
--- ./tools/gitlog2changelog.py.orig 2020-06-24 23:23:42.310626145 +0200
30
+++ ./tools/gitlog2changelog.py 2020-06-24 23:23:54.974626228 +0200
31
32
-#!/usr/bin/env python
33
+#!/usr/bin/env python3
34
# Copyright 2008 Marcus D. Hanwell <marcus@cryos.org>
35
# Minor changes for NUT by Charles Lepple
36
# Distributed under the terms of the GNU General Public License v2 or later
37
--- ./tools/nut-snmpinfo.py.orig 2020-06-24 23:23:35.654626962 +0200
38
+++ ./tools/nut-snmpinfo.py 2020-06-24 23:24:06.022625839 +0200
39
40
-#!/usr/bin/env python
41
+#!/usr/bin/env python3
42
# Copyright (C) 2011-2019 Eaton
43
# Authors: Frederic Bohe <FredericBohe@Eaton.com>
44
# Arnaud Quette <ArnaudQuette@Eaton.com>
45
--- tools/Makefile.am.orig 2020-06-24 23:39:09.103001606 +0200
46
+++ tools/Makefile.am 2020-06-24 23:39:22.971001606 +0200
47
48
nut-scanner-deps-usb: $(GENERATED_USB_FILES)
49
50
$(GENERATED_SNMP_FILES): $(top_srcdir)/drivers/*-mib.c
51
- @if python -c 1; then \
52
+ @if python3 -c 1; then \
53
echo "Regenerating the SNMP helper files in SRC dir."; \
54
TOP_SRCDIR="$(top_srcdir)" ; export TOP_SRCDIR; \
55
TOP_BUILDDIR="$(top_builddir)" ; export TOP_BUILDDIR; \
56
57
# so it may write the files in "dist" case (read-only sources), but the script
58
# is called from the distdir where its copy is present.
59
dist-hook:
60
- @if python -c 1; then \
61
+ @if python3 -c 1; then \
62
echo "Regenerating the SNMP helper files in DIST dir."; \
63
TOP_SRCDIR="$(top_srcdir)" ; export TOP_SRCDIR; \
64
TOP_BUILDDIR="$(top_builddir)" ; export TOP_BUILDDIR; \
65