diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-08-20 12:43:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-20 12:43:25 +0200 |
| commit | 61de37f7535b72b39d055d1be55fa1fda7f5d8f5 (patch) | |
| tree | 2e7137d799e4e8425ff607f27f16a138fb62033f /pkgs/tools/misc/barman | |
| parent | 1131676bb05d26e0d75dc61525b73fb70bfdef33 (diff) | |
| parent | a05a338df5f42676a64347122d9fe94e05e92f79 (diff) | |
Merge pull request #182142 from treed/barman-subprocess
barman: patch out subprocess wrapper
Diffstat (limited to 'pkgs/tools/misc/barman')
| -rw-r--r-- | pkgs/tools/misc/barman/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/barman/unwrap-subprocess.patch | 30 |
2 files changed, 34 insertions, 0 deletions
diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/tools/misc/barman/default.nix index 36fd90273f294..d63b02b92b7b9 100644 --- a/pkgs/tools/misc/barman/default.nix +++ b/pkgs/tools/misc/barman/default.nix @@ -13,6 +13,10 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-e6euOtvJx+xUq5pWmWK6l7nv/twOa+0OABUTYvMd8Ow="; }; + patches = [ + ./unwrap-subprocess.patch + ]; + checkInputs = with python3Packages; [ mock python-snappy diff --git a/pkgs/tools/misc/barman/unwrap-subprocess.patch b/pkgs/tools/misc/barman/unwrap-subprocess.patch new file mode 100644 index 0000000000000..7dfd6529a2935 --- /dev/null +++ b/pkgs/tools/misc/barman/unwrap-subprocess.patch @@ -0,0 +1,30 @@ +--- a/barman/command_wrappers.py ++++ b/barman/command_wrappers.py +@@ -1144,5 +1144,5 @@ + # * pass the current configuration file with -c + # * set it quiet with -q +- self.command = [sys.executable, command, "-c", config, "-q", subcommand] ++ self.command = [command, "-c", config, "-q", subcommand] + self.keep_descriptors = keep_descriptors + # Handle args for the sub-command (like the server name) + +--- a/tests/test_command_wrappers.py ++++ a/tests/test_command_wrappers.py +@@ -1595,5 +1595,4 @@ + ) + assert subprocess.command == [ +- sys.executable, + sys.argv[0], + "-c", +@@ -1622,5 +1621,4 @@ + ) + assert subprocess.command == [ +- sys.executable, + "path/to/barman", + "-c", +@@ -1644,5 +1642,4 @@ + + command = [ +- sys.executable, + "path/to/barman", + "-c", |