[neon/extras/calamares/Neon/stable] debian/patches: remove patch in branch

Jonathan Riddell null at kde.org
Tue Feb 27 21:34:21 GMT 2024


Git commit b53d5a4d6648712edc27f5502751b73f00290067 by Jonathan Riddell.
Committed on 27/02/2024 at 21:34.
Pushed by jriddell into branch 'Neon/stable'.

remove patch in branch

D  +0    -26   debian/patches/network-config.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/extras/calamares/-/commit/b53d5a4d6648712edc27f5502751b73f00290067

diff --git a/debian/patches/network-config.diff b/debian/patches/network-config.diff
deleted file mode 100644
index 4808a29..0000000
--- a/debian/patches/network-config.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 5568d22549384a092a0d294d7343840d186839c6
-Author: Adriaan de Groot <groot at kde.org>
-Date:   Tue Feb 27 22:16:14 2024 +0100
-
-    [networkcfg] fix python crash
-    
-    open(path, "w") returns a TextIOWrapper,
-    open(path, "wb") returns a BufferedWriter,
-    .. neither of which is one of the types that os.chmod()
-       consumes. Use fileno(), an integer file-descriptor.
-    
-    FIXES #2294
-
-diff --git a/src/modules/networkcfg/main.py b/src/modules/networkcfg/main.py
-index 9c8965f85..efe6930ee 100644
---- a/src/modules/networkcfg/main.py
-+++ b/src/modules/networkcfg/main.py
-@@ -155,7 +155,7 @@ network:
- """
-             with open(renderer_file, 'w') as f:
-                 f.writelines(nm_renderer)
--                os.chmod(f, 0o600)
-+                os.chmod(f.fileno(), 0o600)
- 
-         # Copy existing Netplan configuration
-         for cfg in glob.glob(os.path.join(source_netplan, "*.yaml")):
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0dbf62f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-network-config.diff


More information about the Neon-commits mailing list