diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /sys-power/nut/files | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'sys-power/nut/files')
| -rw-r--r-- | sys-power/nut/files/nut-2.7.4-py3.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/sys-power/nut/files/nut-2.7.4-py3.patch b/sys-power/nut/files/nut-2.7.4-py3.patch new file mode 100644 index 000000000000..dbe661982eb1 --- /dev/null +++ b/sys-power/nut/files/nut-2.7.4-py3.patch @@ -0,0 +1,56 @@ +From eea0c5e9e5566c36a8b1e364ed4909231901a8f5 Mon Sep 17 00:00:00 2001 +From: Florian Bruhin <git@the-compiler.org> +Date: Tue, 29 Nov 2016 10:45:04 +0100 +Subject: [PATCH 1/2] Make gen-nutupsconf-aug.py work with Python 3 + +This makes the script work with Python 2.6+. +Fixes #345. +--- + scripts/augeas/gen-nutupsconf-aug.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/scripts/augeas/gen-nutupsconf-aug.py b/scripts/augeas/gen-nutupsconf-aug.py +index 55db17a73..4bb201602 100755 +--- a/scripts/augeas/gen-nutupsconf-aug.py ++++ b/scripts/augeas/gen-nutupsconf-aug.py +@@ -18,6 +18,8 @@ + # This program extracts all drivers specific variables, declared + # using 'addvar()' and output a complete ups.conf lens for Augeas + ++from __future__ import print_function ++ + import sys + import re + import glob +@@ -69,7 +71,7 @@ def grep(string,list): + + if (len(sys.argv) == 2): + dirPrefix = sys.argv[1] +- print dirPrefix ++ print(dirPrefix) + + # 1/ Extract all specific drivers parameters, in a sorted list with unique entries + # 1.1/ List all drivers implementation files + +From 7bf209a5deef1ec1f05cf89c25c8399590d4e4e8 Mon Sep 17 00:00:00 2001 +From: Florian Bruhin <git@the-compiler.org> +Date: Tue, 29 Nov 2016 17:37:01 +0100 +Subject: [PATCH 2/2] Fix gitlog2changelog.py on python 3 + +--- + tools/gitlog2changelog.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/gitlog2changelog.py b/tools/gitlog2changelog.py +index d8c089187..f0bea4af6 100755 +--- a/tools/gitlog2changelog.py ++++ b/tools/gitlog2changelog.py +@@ -80,7 +80,7 @@ + else: + message = message + " " + line.strip() + # If this line is hit all of the files have been stored for this commit +- elif re.search('files? changed', line) >= 0: ++ elif re.search('files? changed', line): + filesFound = True + continue + # Collect the files for this commit. FIXME: Still need to add +/- to files |