diff options
author | Nicolas Graves <[email protected]> | 2024-10-20 00:57:33 +0200 |
---|---|---|
committer | Ludovic Courtès <[email protected]> | 2024-10-23 12:59:58 +0200 |
commit | 04f084f2d40a962d3fbad3de817f4ce0df31ef44 (patch) | |
tree | 7537923f7ce7483553c0996e25d8bb0656f2d884 /gnu/packages/patches/debops-debops-defaults-fall-back-to-less.patch | |
parent | b3092b8064a8b3037f8b96c0de4817506cb417a7 (diff) |
gnu: debops: Update to 3.2.2.
* gnu/packages/patches/debops-constants-for-external-program-names.patch
and gnu/packages/patches/debops-debops-defaults-fall-back-to-less.patch:
Remove patches.
* gnu/packages/patches/debops-setup-py-avoid-git.patch: Add patch.
* gnu/local.mk: Adjust patches.
* gnu/packages/admin.scm (debops): Update to 3.2.2.
[source]<patches>: Adjust patches.
[build-system]: Switch to pyproject-build-system.
[native-inputs]: Remove git.
[inputs]: Add git, git-crypt.
[propagated-inputs]: Reorder. Add python-dotenv, python-future,
python-gitpython, python-jinja2, python-pyyaml, python-pyxdg,
python-toml.
[arguments]<#:tests?>: Unset (although no tests in source).
<#:phases>: Remove all existing modifications. Add 'wrap-script phase.
<#:modules>: Add for <#phases>.
Signed-off-by: Ludovic Courtès <[email protected]>
Diffstat (limited to 'gnu/packages/patches/debops-debops-defaults-fall-back-to-less.patch')
-rw-r--r-- | gnu/packages/patches/debops-debops-defaults-fall-back-to-less.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/gnu/packages/patches/debops-debops-defaults-fall-back-to-less.patch b/gnu/packages/patches/debops-debops-defaults-fall-back-to-less.patch deleted file mode 100644 index bbb6b7c08e..0000000000 --- a/gnu/packages/patches/debops-debops-defaults-fall-back-to-less.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 5059daf8bd59a83f520c14731173ea76ce8b8661 Mon Sep 17 00:00:00 2001 -From: Hartmut Goebel <[email protected]> -Date: Sun, 8 Sep 2019 13:09:15 +0200 -Subject: [PATCH] [debops-defaults] If `view` is not available, try less, etc. - ---- - bin/debops-defaults | 21 +++++++++++++++------ - 1 file changed, 15 insertions(+), 6 deletions(-) - -diff --git a/bin/debops-defaults b/bin/debops-defaults -index 9dd87fe0a..3e3db4c41 100755 ---- a/bin/debops-defaults -+++ b/bin/debops-defaults -@@ -96,13 +96,22 @@ def main(role_list): - config = read_config(project_root) - playbooks_path = find_playbookpath(config, project_root, required=True) - -- # Make sure required commands are present -- require_commands('view') -- -- if sys.stdout.isatty(): -+ # Check if one of the output commands is present -+ sys.stdout = io.BytesIO() # suppress error message, if any -+ for cmd_args in (('view', '+set ft=yaml', '-'), -+ ('less', '-'), -+ ('more', '-')): -+ try: -+ require_commands(cmd_args[0]) -+ break -+ except SystemExit: -+ # this command was not found -+ cmd_args = None -+ sys.stdout = sys.__stdout__ -+ -+ if cmd_args and sys.stdout.isatty(): - # if script is run as standalone, redirect to view -- view = subprocess.Popen(['view', '+set ft=yaml', '-'], -- stdin=subprocess.PIPE) -+ view = subprocess.Popen(cmd_args, stdin=subprocess.PIPE) - try: - aggregate_defaults(playbooks_path, role_list, view.stdin) - except IOError as e: --- -2.21.0 - |