From c1aa0ee9bdbdd229bba50dec6d1c0f41bff7b8d2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 10 Jan 2022 17:43:52 +0100 Subject: guix hash: Allow '-r' as a non-deprecated alias. This is a followup to 05c962594c346da21f201be72caadfa19060cc9d. Discussed at . * guix/scripts/hash.scm (%options): Warn about deprecation for "--recursive", but not for '-r' as it's a convenient shorthand. Mention '--serializer=nar' in the deprecation message. * doc/guix.texi (Invoking guix hash): Adjust accordingly. --- guix/scripts/hash.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'guix/scripts') diff --git a/guix/scripts/hash.scm b/guix/scripts/hash.scm index 9715dc7779..4e792c6a03 100644 --- a/guix/scripts/hash.scm +++ b/guix/scripts/hash.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2016, 2017, 2020, 2021 Ludovic Courtès +;;; Copyright © 2012-2014, 2016-2017, 2020-2022 Ludovic Courtès ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2018 Tim Gesthuizen @@ -134,8 +134,9 @@ and 'base16' ('hex' and 'hexadecimal' can be used as well).\n")) (alist-delete 'format result)))) (option '(#\r "recursive") #f #f (lambda (opt name arg result) - (warning (G_ "'--recursive' is deprecated, \ -use '--serializer' instead~%")) + (unless (eqv? name #\r) + (warning (G_ "'--recursive' is deprecated, \ +use '--serializer=nar' instead~%"))) (alist-cons 'serializer nar-hash (alist-delete 'serializer result)))) (option '(#\S "serializer") #t #f -- cgit v1.2.3