From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15679 invoked by alias); 30 Jul 2017 17:45:04 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 41474 Received: (qmail 17838 invoked from network); 30 Jul 2017 17:45:04 -0000 X-Qmail-Scanner-Diagnostics: from out1-smtp.messagingengine.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(66.111.4.25):SA:0(-0.7/5.0):. Processed in 3.02632 secs); 30 Jul 2017 17:45:04 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 X-Envelope-From: d.s@daniel.shahaf.name X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: none (ns1.primenet.com.au: domain at daniel.shahaf.name does not designate permitted sender hosts) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= daniel.shahaf.name; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=F2P8AL ICilZ/kSPuA3Qq6h9ieRKftO3gHIDWUNyVez0=; b=pwbhqn+KAnggVJC4erJrVx U4Jy/Tfd4y/QKBmdBv0pacFNNel5Wq65TKz5BlGi1RTQfF1XNfVjQc964gmcyJlW N7ZX7TbwPGHpaeuenH7kflZsSF+BNFjvLm+l0K1sSsdaqAZMeAdCTB39ocUlyuQX J4Q6C83CiEjwIZQQXRHHpR/iBEAAzAb20+upg3lK3Jl2vFpOravLf/Ajpeyn8nm+ QyR+uyE+IjbbCD/GzhrIJwh5q+dB876CcnAYBnFeVklHe01ao4xa336vfvvJ4VV6 IONY+s3T7G+Vjc1f7AlG9SORZ9YU5zEeNb3tHJWkroTC6qRpF19l8g99b8hdZ9Fg == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=F2P8AL ICilZ/kSPuA3Qq6h9ieRKftO3gHIDWUNyVez0=; b=OENRSeCHUOAmjusuQZAu/h cvwhoAma64yFWxemlMPlldumaH4PZC/Cc9u1Y/LFIRJGn8x0seVGDwLAhUd9jq7k I217YrbnF668LsY6WXo+DAO+4utHa9E/L7MxSZJ9yWfV0Srwi0ExFB03RZARWwzk HlYBCZIaArOWYTl6cxkU1FT1H/kt9Q5gJOIaXpb+Yy+xI0wy7rVQFOgljQ9gG0JJ 8GsFhGQtpE0DrnCpijIMh8BHK5ZrZnQyYlS/qo0+CEa/q5pVPbtnlIgcwv1po04v cIn4EVWAZTAqk22R9NDDbxicGcJIsD32poa8dwwbGLIeMdwllnQgkaRh9CY/uN3g == X-ME-Sender: X-Sasl-enc: KSUqDN6BBPoVeevypmY1PPR+2RB8+mJGrsiVjqpJb43E 1501436251 From: Daniel Shahaf To: zsh-workers@zsh.org Cc: Mattia Rizzolo Subject: [PATCH] Fix pbuilder's --distribution,--architecture completion. Date: Sun, 30 Jul 2017 17:37:29 +0000 Message-Id: <20170730173729.26850-1-danielsh@tarpaulin.shahaf.local2> X-Mailer: git-send-email 2.11.0 --- Completion/Debian/Command/_pbuilder | 4 ++-- Completion/Debian/Type/_deb_codenames | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 Completion/Debian/Type/_deb_codenames diff --git a/Completion/Debian/Command/_pbuilder b/Completion/Debian/Command/_pbuilder index 9322d036a..6377538b2 100644 --- a/Completion/Debian/Command/_pbuilder +++ b/Completion/Debian/Command/_pbuilder @@ -14,8 +14,8 @@ else '--buildresult:location:_files -/' \ '--mirror:URL:_urls' \ '--othermirror:URL:_urls' \ - '--distribution:suite:(breezy dapper edgy etch feisty gutsy hardy hoary intrepid jaunty jessie karmic lenny lucid potato sarge sid squeeze warty woody' \ - '--architecture:architecture:i_deb_architectures' \ + '--distribution:codename:_deb_codenames' \ + '--architecture:architecture:_deb_architectures' \ '--components:component:(main contrib non-free)' \ '--override-config' \ '--hookdir:location:_files -/' \ diff --git a/Completion/Debian/Type/_deb_codenames b/Completion/Debian/Type/_deb_codenames new file mode 100644 index 000000000..feea8b49a --- /dev/null +++ b/Completion/Debian/Type/_deb_codenames @@ -0,0 +1,12 @@ +#autoload + +local distro codenames ret=1 + +for distro in /usr/share/distro-info/*.csv(N); do + # TODO: magic number "6" + codenames=( ${(f)"$(<$distro tail -n6 | cut -d, -f3,1)"} ) + codenames=( ${codenames/(#b)(*),(*)/${match[2]}:${match[1]}} ) + _describe -V -t codename-${distro:t:r} "${distro:t:r} codenames" codenames && ret=0 +done + +return ret This function uses distro-info-data because I figured a hardcoded list of codenames would bitrot sooner or later. The hardcoded "6" is because EOL dates are not available in the Debian stable version of distro-info-data.