Control: tags 1141285 + patch Control: tags 1141285 + pending Dear maintainer,
I've prepared an NMU for ranger (versioned as 1.9.4-2.1) and uploaded it to DELAYED/1. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for ranger-1.9.4 ranger-1.9.4 changelog | 7 + patches/0001-core-ext-Avoid-return-in-finally-shadowing-return-va.patch | 58 ++++++++++ patches/0002-make-sensible-decisions-on-which-pager-and-editor.patch | 11 - patches/series | 1 4 files changed, 69 insertions(+), 8 deletions(-) diff -Nru ranger-1.9.4/debian/changelog ranger-1.9.4/debian/changelog --- ranger-1.9.4/debian/changelog 2025-03-20 04:35:02.000000000 +0200 +++ ranger-1.9.4/debian/changelog 2026-07-06 22:05:43.000000000 +0300 @@ -1,3 +1,10 @@ +ranger (1.9.4-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fix for Python 3.14. (Closes: #1141285) + + -- Adrian Bunk <[email protected]> Mon, 06 Jul 2026 22:05:43 +0300 + ranger (1.9.4-2) unstable; urgency=medium * Cherry-pick upstream fix for issue #1603. (Closes: #1021946) diff -Nru ranger-1.9.4/debian/patches/0001-core-ext-Avoid-return-in-finally-shadowing-return-va.patch ranger-1.9.4/debian/patches/0001-core-ext-Avoid-return-in-finally-shadowing-return-va.patch --- ranger-1.9.4/debian/patches/0001-core-ext-Avoid-return-in-finally-shadowing-return-va.patch 1970-01-01 02:00:00.000000000 +0200 +++ ranger-1.9.4/debian/patches/0001-core-ext-Avoid-return-in-finally-shadowing-return-va.patch 2026-07-06 22:05:43.000000000 +0300 @@ -0,0 +1,58 @@ +From ff6f684b017eb57bc445fc3fc8ce0b74b3367f1d Mon Sep 17 00:00:00 2001 +From: toonn <[email protected]> +Date: Wed, 1 Jan 2025 20:54:57 +0100 +Subject: core,ext: Avoid return in finally shadowing return value + +--- + ranger/core/main.py | 3 ++- + ranger/core/runner.py | 23 ++++++++++++----------- + 2 files changed, 14 insertions(+), 12 deletions(-) + +diff --git a/ranger/core/main.py b/ranger/core/main.py +index 7322a501..22c62044 100644 +--- a/ranger/core/main.py ++++ b/ranger/core/main.py +@@ -237,7 +237,8 @@ https://github.com/ranger/ranger/issues + # print the exit message if any + if exit_msg: + sys.stderr.write(exit_msg) +- return exit_code # pylint: disable=lost-exception ++ ++ return exit_code # pylint: disable=lost-exception + + + def get_paths(args): +diff --git a/ranger/core/runner.py b/ranger/core/runner.py +index d465f070..97975e76 100644 +--- a/ranger/core/runner.py ++++ b/ranger/core/runner.py +@@ -253,14 +253,15 @@ class Runner(object): # pylint: disable=too-few-public-methods + self.zombies.add(process) + if wait_for_enter: + press_enter() +- finally: +- self.fm.signal_emit('runner.execute.after', +- popen_kws=popen_kws, context=context, error=error) +- if devnull: +- devnull.close() +- if toggle_ui: +- self._activate_ui(True) +- if pipe_output and process: +- return self(action='less', app='pager', # pylint: disable=lost-exception +- try_app_first=True, stdin=process.stdout) +- return process # pylint: disable=lost-exception ++ except Exception: # pylint: disable=broad-exception-caught ++ pass ++ self.fm.signal_emit('runner.execute.after', ++ popen_kws=popen_kws, context=context, error=error) ++ if devnull: ++ devnull.close() ++ if toggle_ui: ++ self._activate_ui(True) ++ if pipe_output and process: ++ return self(action='less', app='pager', ++ try_app_first=True, stdin=process.stdout) ++ return process +-- +2.47.3 + diff -Nru ranger-1.9.4/debian/patches/0002-make-sensible-decisions-on-which-pager-and-editor.patch ranger-1.9.4/debian/patches/0002-make-sensible-decisions-on-which-pager-and-editor.patch --- ranger-1.9.4/debian/patches/0002-make-sensible-decisions-on-which-pager-and-editor.patch 2024-11-24 00:13:22.000000000 +0200 +++ ranger-1.9.4/debian/patches/0002-make-sensible-decisions-on-which-pager-and-editor.patch 2026-07-06 22:05:43.000000000 +0300 @@ -59,14 +59,9 @@ =================================================================== --- ranger.orig/ranger/core/runner.py +++ ranger/ranger/core/runner.py -@@ -261,6 +261,6 @@ class Runner(object): # pylint: disable - if toggle_ui: - self._activate_ui(True) - if pipe_output and process: -- return self(action='less', app='pager', # pylint: disable=lost-exception -+ return self(action='sensible-pager', app='pager', # pylint: disable=lost-exception - try_app_first=True, stdin=process.stdout) - return process # pylint: disable=lost-exception +@@ -261,1 +261,1 @@ class Runner(object): # pylint: disable +- return self(action='less', app='pager', ++ return self(action='sensible-pager', app='pager', Index: ranger/ranger/ext/rifle.py =================================================================== --- ranger.orig/ranger/ext/rifle.py diff -Nru ranger-1.9.4/debian/patches/series ranger-1.9.4/debian/patches/series --- ranger-1.9.4/debian/patches/series 2025-03-20 04:33:49.000000000 +0200 +++ ranger-1.9.4/debian/patches/series 2026-07-06 22:05:43.000000000 +0300 @@ -1,4 +1,5 @@ 5a02902253b76fe39f36b9a63a52a24fba0c7142.patch +0001-core-ext-Avoid-return-in-finally-shadowing-return-va.patch scope-fix-shellcheck.patch 0001-comply-with-the-Debian-policy-10.7.2.patch 0002-make-sensible-decisions-on-which-pager-and-editor.patch
