diff options
| author | Peter Pentchev <roam@debian.org> | 2023-01-03 00:37:22 +0200 |
|---|---|---|
| committer | Peter Pentchev <roam@ringlet.net> | 2023-01-03 02:24:59 +0200 |
| commit | 7947d3a13dcf3ff7d651c312ca37c8d69d309118 (patch) | |
| tree | 3061f291dc6f81ebc4e7c7b9f5b0beefa47d6586 | |
| parent | cf680e77812663f3d92eb85b889b32eadf61c785 (diff) | |
Add the rsync-unquoted patch to fix a shellcheck FTBFS
Closes: #1027490
| -rw-r--r-- | debian/patches/rsync-unquoted.patch | 29 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/debian/patches/rsync-unquoted.patch b/debian/patches/rsync-unquoted.patch new file mode 100644 index 0000000..daaa12a --- /dev/null +++ b/debian/patches/rsync-unquoted.patch @@ -0,0 +1,29 @@ +Description: Make the rsync invocation a bit more shell-friendly + Version 0.9 of the shellcheck utility shows a new diagnostic message for + our rsync invocation with unquoted $noop, $v, and $delete variables, so + make what we are trying to do there fully explicit. +Bug-Debian: https://bugs.debian.org/1027490 +Origin: upstream, https://gitlab.com/ppentchev/repopush/-/commit/772cc3f43367c4e3c8ba767c75ecb7d7ca5a058c +Author: Peter Pentchev <roam@ringlet.net> +Last-Update: 2023-01-03 + +--- a/repopush.sh ++++ b/repopush.sh +@@ -1,6 +1,6 @@ + #!/bin/sh + # +-# Copyright (c) 2020, 2021 Peter Pentchev <roam@ringlet.net> ++# Copyright (c) 2020 - 2023 Peter Pentchev <roam@ringlet.net> + # All rights reserved. + # + # Redistribution and use in source and binary forms, with or without +@@ -99,8 +99,7 @@ + { + local n="$1" ntotal="$2" desc="$3" path="$4" delete="$5" + debug "- $n/$ntotal: $desc" +- # shellcheck disable=SC2086 +- rsync $noop $v -az $delete -- "$locpath$path/" "$remote$path/" ++ rsync ${noop:+-n} ${v:+-v} -az ${delete:+--delete} -- "$locpath$path/" "$remote$path/" + } + + sync_debrepo() diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..07dd786 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +rsync-unquoted.patch |