From 86cdfc451bad61faa66f100208c95f3275050957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 23 Nov 2015 17:37:29 +0100
Subject: [PATCH] guix download: Fail when more than one URL is passed.
* guix/scripts/download.scm (guix-download)[parse-option]: Call 'leave'
when passed an extra argument.
* tests/guix-download.sh: Add test.
---
guix/scripts/download.scm | 3 +++
tests/guix-download.sh | 6 +++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/guix/scripts/download.scm b/guix/scripts/download.scm
index b81295e5d9d..6ebc14f5733 100644
--- a/guix/scripts/download.scm
+++ b/guix/scripts/download.scm
@@ -96,6 +96,9 @@ (define (parse-options)
(lambda (opt name arg result)
(leave (_ "~A: unrecognized option~%") name))
(lambda (arg result)
+ (when (assq 'argument result)
+ (leave (_ "~A: extraneous argument~%") arg))
+
(alist-cons 'argument arg result))
%default-options))
diff --git a/tests/guix-download.sh b/tests/guix-download.sh
index 7af6f181f6a..6283772c480 100644
--- a/tests/guix-download.sh
+++ b/tests/guix-download.sh
@@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU
-# Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2015 Ludovic Courtès <ludo@gnu.org>
#
# This file is part of GNU Guix.
#
@@ -34,3 +34,7 @@ then false; else true; fi
# This one should succeed.
guix download "file://$abs_top_srcdir/README"
+
+# This one should fail.
+if guix download "file:///does-not-exist" "file://$abs_top_srcdir/README"
+then false; else true; fi
--
GitLab