diff options
| author | Julian Andres Klode <jak@debian.org> | 2022-01-05 16:35:04 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2022-01-05 16:35:04 +0000 |
| commit | eac32564d294caf264cabb62c776444f973b111a (patch) | |
| tree | 7f440eee49c542c236cb7b469270bbd918a69525 | |
| parent | 583c0903a99d4ade4c6d7214f9e726940e613ad8 (diff) | |
| parent | e7511e1955c250e3e59b2a32b0c29374816b47dd (diff) | |
Merge branch 'cmp-short-options' into 'main'
Use short options for cmp
See merge request apt-team/apt!203
| -rw-r--r-- | cmdline/apt-key.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in index 137546de3..3c83a8b3d 100644 --- a/cmdline/apt-key.in +++ b/cmdline/apt-key.in @@ -314,11 +314,11 @@ is_supported_keyring() { local FILEEXT="${1##*.}" if [ "$FILEEXT" = 'gpg' ]; then # 0x98, 0x99 and 0xC6 via octal as hex isn't supported by dashs printf - if printf '\231' | cmp --silent --bytes=1 - "$1"; then + if printf '\231' | cmp -s -n 1 - "$1"; then true - elif printf '\230' | cmp --silent --bytes=1 - "$1"; then + elif printf '\230' | cmp -s -n 1 - "$1"; then true - elif printf '\306' | cmp --silent --bytes=1 - "$1"; then + elif printf '\306' | cmp -s -n 1 - "$1"; then true else apt_warn "The key(s) in the keyring $1 are ignored as the file has an unsupported filetype." |