From cc57f25d96f3007682a4e41a8b5871f05f76e23f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 7 Jan 2013 22:54:54 +0100
Subject: [PATCH] guix-package: Remove `-b' shorthand for `--bootstrap'.

* guix-package.in (%options): Remove #\b as an alternate for
  "bootstrap".
  (show-help): Adjust accordingly.
* tests/guix-package.sh: Use `--bootstrap' instead of `-b'.
---
 guix-package.in       |  4 ++--
 tests/guix-package.sh | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/guix-package.in b/guix-package.in
index 4dc625778b..628a2b595f 100644
--- a/guix-package.in
+++ b/guix-package.in
@@ -201,7 +201,7 @@ Install, remove, or upgrade PACKAGES in a single transaction.\n"))
   (display (_ "
   -n, --dry-run          show what would be done without actually doing it"))
   (display (_ "
-  -b, --bootstrap        use the bootstrap Guile to build the profile"))
+      --bootstrap        use the bootstrap Guile to build the profile"))
   (display (_ "
       --verbose          produce verbose output"))
   (newline)
@@ -242,7 +242,7 @@ Install, remove, or upgrade PACKAGES in a single transaction.\n"))
         (option '(#\n "dry-run") #f #f
                 (lambda (opt name arg result)
                   (alist-cons 'dry-run? #t result)))
-        (option '(#\b "bootstrap") #f #f
+        (option '("bootstrap") #f #f
                 (lambda (opt name arg result)
                   (alist-cons 'bootstrap? #t result)))
         (option '("verbose") #f #f
diff --git a/tests/guix-package.sh b/tests/guix-package.sh
index 81b7f05634..bd2c816b9a 100644
--- a/tests/guix-package.sh
+++ b/tests/guix-package.sh
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
 #
 # This file is part of GNU Guix.
 #
@@ -27,13 +27,13 @@ rm -f "$profile"
 
 trap 'rm "$profile" "$profile-"[0-9]*' EXIT
 
-guix-package -b -p "$profile"						\
+guix-package --bootstrap -p "$profile"						\
     -i `guix-build -e '(@@ (distro packages base) %bootstrap-guile)'`
 test -L "$profile" && test -L "$profile-1-link"
 test -f "$profile/bin/guile"
 
 # Installing the same package a second time does nothing.
-guix-package -b -p "$profile"						\
+guix-package --bootstrap -p "$profile"						\
     -i `guix-build -e '(@@ (distro packages base) %bootstrap-guile)'`
 test -L "$profile" && test -L "$profile-1-link"
 ! test -f "$profile-2-link"
@@ -42,7 +42,7 @@ test -f "$profile/bin/guile"
 # Check whether we have network access.
 if guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/null
 then
-    guix-package -b -p "$profile"						\
+    guix-package --bootstrap -p "$profile"						\
 	-i `guix-build -e '(@@ (distro packages base) gnu-make-boot0)'`
     test -L "$profile-2-link"
     test -f "$profile/bin/make" && test -f "$profile/bin/guile"
@@ -64,13 +64,13 @@ then
     test "`guix-package -p "$profile" -I 'g.*e' | cut -f1`" = "guile-bootstrap"
 
     # Remove a package.
-    guix-package -b -p "$profile" -r "guile-bootstrap"
+    guix-package --bootstrap -p "$profile" -r "guile-bootstrap"
     test -L "$profile-3-link"
     test -f "$profile/bin/make" && ! test -f "$profile/bin/guile"
 fi
 
 # Make sure the `:' syntax works.
-guix-package -b -i "libsigsegv:lib" -n
+guix-package --bootstrap -i "libsigsegv:lib" -n
 
 # Check whether `--list-available' returns something sensible.
 guix-package -A 'gui.*e' | grep guile