From 134bb906da20344e15b5d7935751e8e9f2d82f57 Mon Sep 17 00:00:00 2001
From: Baptiste BEAUPLAT <lyknode@cilg.org>
Date: Tue, 10 Dec 2019 10:50:03 +0100
Subject: [PATCH 6/7] Rename _sbuild internal functions to avoid overlap

---
 Completion/Debian/Command/_sbuild | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Completion/Debian/Command/_sbuild b/Completion/Debian/Command/_sbuild
index 23a88e907..cc1df0f4c 100644
--- a/Completion/Debian/Command/_sbuild
+++ b/Completion/Debian/Command/_sbuild
@@ -1,11 +1,11 @@
 #compdef sbuild
 
-_deb_distributions() {
+_sbuild_distributions() {
   _deb_codenames
   compadd "$@" -- unstable
 }
 
-_get_identity() {
+_deb_identity() {
   local identity
 
   if [[ -n "${DEBEMAIL}" ]]; then
@@ -18,7 +18,7 @@ _get_identity() {
   fi
 }
 
-_get_gpg_key() {
+_sbuild_signing_key() {
   local -a lines uids
   local line
 
@@ -52,7 +52,7 @@ _sbuild() {
     '(-b --batch)'{-b,--batch}'[operate in batchmode]' \
     '(-c --chroot)'{-c=,--chroot=}'[chroot to use]:chroot' \
     '(--chroot-mode)--chroot-mode=[chroot mode]:mode:(schroot sudo autopkgtest unshare)' \
-    '(-d --dist)'{-d=,--dist=}'[distribution]:distribution:_deb_distributions' \
+    '(-d --dist)'{-d=,--dist=}'[distribution]:distribution:_sbuild_distributions' \
     '--archive=[use specified archive]' \
     '(--apt-clean --no-apt-clean)--apt-clean[force apt-get clean]' \
     '(--apt-clean --no-apt-clean)--no-apt-clean[do not apt-get clean]' \
@@ -60,9 +60,9 @@ _sbuild() {
     '(--apt-upgrade --no-apt-upgrade)--no-apt-upgrade[do not apt-get upgrade]' \
     '(--apt-distupgrade --no-apt-distupgrade)--apt-distupgrade[force apt-get distupgrade]' \
     '(--apt-distupgrade --no-apt-distupgrade)--no-apt-distupgrade[do not apt-get distupgrade]' \
-    '(-m --maintainer)'{-m=,--maintainer=}'[Maintainer field for .changes]:maintainer:_get_identity' \
-    '(-e --uploader)'{-e=,--uploader=}'[Uploader field for .changes]:uploader:_get_identity' \
-    '(-k --keyid)'{-k=,--keyid=}'[GPG Key to sign packages]:gpg key:_get_gpg_key' \
+    '(-m --maintainer)'{-m=,--maintainer=}'[Maintainer field for .changes]:maintainer:_deb_identity' \
+    '(-e --uploader)'{-e=,--uploader=}'[Uploader field for .changes]:uploader:_deb_identity' \
+    '(-k --keyid)'{-k=,--keyid=}'[GPG Key to sign packages]:gpg key:_sbuild_signing_key' \
     '(-j --jobs)'{-j=,--jobs=}'[jobs to run simultaneously]:number of jobs' \
     '--debbuildopt=[option to dpkg-buildpackage]:option' \
     '--debbuildopts=[options to dpkg-buildpackage]:options' \
-- 
2.24.0