Attachment 3175 Details for Bug 2902 – proposed patches

[patch] proposed patches

file_2902.txt (text/plain), 1.67 KB, created by Jakub Jelen on 2018-08-29 00:16:55 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Jelen

Created: 2018-08-29 00:16:55 AEST

Size: 1.67 KB

patch

obsolete

>From 638e7ca6301fe5e6533034cf48a5535b65db5041 Mon Sep 17 00:00:00 2001
>From: Jakub Jelen <jjelen@redhat.com>
>Date: Tue, 28 Aug 2018 15:35:01 +0200
>Subject: [PATCH 1/2] ssh-copy-id: Shelcheck does not like this variable
> initialization [SC1007]
>
>---
> contrib/ssh-copy-id | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
>index b83b8361..55260d12 100644
>--- a/contrib/ssh-copy-id
>+++ b/contrib/ssh-copy-id
>@@ -112,7 +112,8 @@ do
>         usage
>   }
> 
>-  OPT= OPTARG=
>+  OPT=''
>+  OPTARG=''
>   # implement something like getopt to avoid Solaris pain
>   case "$1" in
>     -i?*|-o?*|-p?*)
>-- 
>2.17.1
>
>
>From 8a255ea3f2022a97cb7b79f7148b62b2bd22a8d5 Mon Sep 17 00:00:00 2001
>From: Jakub Jelen <jjelen@redhat.com>
>Date: Tue, 28 Aug 2018 15:36:00 +0200
>Subject: [PATCH 2/2] ssh-copy-id: Bogus variable in printf [SC2182]
>
>---
> contrib/ssh-copy-id | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
>index 55260d12..2e0c5749 100644
>--- a/contrib/ssh-copy-id
>+++ b/contrib/ssh-copy-id
>@@ -262,7 +262,7 @@ populate_new_ids() {
>   fi
>   if [ -z "$NEW_IDS" ] ; then
>     printf '\n%s: WARNING: All keys were skipped because they already exist on the remote system.\n' "$0" >&2
>-    printf '\t\t(if you think this is a mistake, you may want to use -f option)\n\n' "$0" >&2
>+    printf '\t\t(if you think this is a mistake, you may want to use -f option)\n\n' >&2
>     exit 0
>   fi
>   printf '%s: INFO: %d key(s) remain to be installed -- if you are prompted now it is to install the new keys\n' "$0" "$(printf '%s\n' "$NEW_IDS" | wc -l)" >&2
>-- 
>2.17.1
>

Actions: View | Diff

Attachments on bug 2902: 3175