From 06456cbdd772375b9de4d0fc5d5db4124dd91866 Mon Sep 17 00:00:00 2001 From: gryf Date: Fri, 14 Jun 2024 11:34:20 +0200 Subject: [PATCH] fix another place for conf reading in tuir --- net-news/tuir/Manifest | 2 +- net-news/tuir/files/tuir-config.patch | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/net-news/tuir/Manifest b/net-news/tuir/Manifest index 329307f..3801d0a 100644 --- a/net-news/tuir/Manifest +++ b/net-news/tuir/Manifest @@ -1,3 +1,3 @@ -AUX tuir-config.patch 505 BLAKE2B d81749bf5f4b190f8bd397096ed2e5964098f17e1830265db0ae1332b3214712fd1d725bb5888dc131d20c4ed5d11867d28a2b5dfd31593ee2fb2ed60d82cb59 SHA512 d4c04d4fc1000ced189a55357e677694baa280aba9b23811e447c18922ee9a2c0b28f9bd6cfc6dffbd8c40d886543035a2b837524327ab7c8b9f6338cb61e71d +AUX tuir-config.patch 1107 BLAKE2B 3eb93f1747a61b7362a54dd3c9425d7b40e64162dd4aad5f4d68265f3b398e6039d18c63a6b4cf6c9deb4f5ac87a1954a419982c7080c784ae2b4b608fef1283 SHA512 0bcbdf8839d6f64df7db3f50ad15305aba96ce948bd87ea4cab4cf4ec48959fc0166b68b814e39b3caf0712fafbafd0d85effd1dd18b6b5367b7da2b867f6cd4 DIST tuir-v1.29.0.tar.bz2 17261008 BLAKE2B bbd621c4ccbd1f257eb14956c225e1a2dc3fb594a91cf739deb32ee67b2c6c823eb8d6ec190a941384b3e230f2afd7747be26cea6f0d98edb7e4b80d2acf02a5 SHA512 a95834e569e6c4d8327ac8e7a4aa69ed47fbd2e82d7bc80f74a2f20b26ddd2ee3f4b00179c8df5ad1917f44f9c20ee39ff04189b9179b583722d6f53a15fd2b5 EBUILD tuir-1.29.0.ebuild 640 BLAKE2B 145707edef5789e4cf8937536b90d10837b0985fadc686fb49f6f63e456685c71da9bb95b3401e00acefdac9e8ad06366fcea22415a8ee09f9f40219eb295ed7 SHA512 7ac4a080c24d0a381366c6f36ad224645a846fbf22d9c9d6dd90d8f510cea229131255a54d191b992cdca7535268b63939c6d218394836a6f3540a5be8c7388e diff --git a/net-news/tuir/files/tuir-config.patch b/net-news/tuir/files/tuir-config.patch index 4708216..8398082 100644 --- a/net-news/tuir/files/tuir-config.patch +++ b/net-news/tuir/files/tuir-config.patch @@ -1,6 +1,6 @@ -diff -ur tuir-v1.29.0-orig/tuir/config.py tuir-v1.29.0/tuir/config.py +diff '--color=auto' -ur tuir-v1.29.0-orig/tuir/config.py tuir-v1.29.0/tuir/config.py --- tuir-v1.29.0-orig/tuir/config.py 2020-04-26 09:12:09.000000000 +0200 -+++ tuir-v1.29.0/tuir/config.py 2024-06-10 09:11:01.010022758 +0200 ++++ tuir-v1.29.0/tuir/config.py 2024-06-14 11:32:12.559187415 +0200 @@ -131,7 +131,7 @@ config = configparser.RawConfigParser() if os.path.exists(filename): @@ -10,3 +10,15 @@ diff -ur tuir-v1.29.0-orig/tuir/config.py tuir-v1.29.0/tuir/config.py return cls._parse_tuir_file(config) +diff '--color=auto' -ur tuir-v1.29.0-orig/tuir/theme.py tuir-v1.29.0/tuir/theme.py +--- tuir-v1.29.0-orig/tuir/theme.py 2020-04-26 09:12:09.000000000 +0200 ++++ tuir-v1.29.0/tuir/theme.py 2024-06-14 11:32:21.555329941 +0200 +@@ -399,7 +399,7 @@ + config = configparser.ConfigParser() + config.optionxform = six.text_type # Preserve case + with codecs.open(filename, encoding='utf-8') as fp: +- config.readfp(fp) ++ config.read_file(fp) + except configparser.ParsingError as e: + raise ConfigError(e.message) +