From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5640 invoked by alias); 12 Sep 2015 23:53:25 -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: 36523 Received: (qmail 22052 invoked from network); 12 Sep 2015 23:53:24 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Date: Sun, 13 Sep 2015 01:53:17 +0200 From: Axel Beckert To: zsh-workers@zsh.org Cc: thuejk@gmail.com Subject: Fwd: [Bug 1495151] zsh completion for gphoto2 gives "--delete-files" instead of the correct "--delete-file" Message-ID: <20150912235317.GM3721@sym.noone.org> Mail-Followup-To: zsh-workers@zsh.org, thuejk@gmail.com MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Operating-System: Linux 3.2.0-4-amd64 X-Machine: sym2 x86_64 X-Editor: GNU Emacs 23.4.1 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAAAAAC3mUtaAAAABGdBTUEAALGPC/xhBQAAADh0RVh0U29mdHdhcmUAWFYgVmVyc2lvbiAzLjEwYSAgUmV2OiAxMi8yOS85NCAoUE5HIHBhdGNoIDEuMindFS5JAAACGElEQVQ4jXXQMU8UYRDG8f8shNjdDH4AbpfGDjAWlKiJiZ0ajL1aGCvsNCbGaCGG1koLaztaTYz6ATy+gOyehYmF3MxVxgg3FnDsHcTpJr/M+8w7Rf6nCsaVTTDqxbg9hoOXmw83H71+Eyfg4E1d7/Z2fG9rGkZbTQiu+K+3U/C+76lmkvAhJuDndnoAiftou4V84okAGclop4U/jYACZDTxrYWP0gkxVfAm/W//GLZpxIzwIN0Hn8dw0B+IWkZmQmRsj2HfhwokEklHfNCCiQCRgAR7YyhQVRVTCKCzP4Y5zBBE0t0zY3Q8oQaBqqAMlVEcgVQd9706zGirAFium8HXumlMIeMwqQCInju+2+uB6MRENupdpMt8pRlHZyuAW0F+Mb6XSIVqtxjD+iVmVqqystLEzFTGT92YqRaXpNT5eTVjeJhbALPnrTxLUZUKZsgxcNm64hAOYisT/xhF+oKTGU5RegtC3Rt6eEDi/QnIevdTx9Md2EMmYBRmCQR1026FCGQQJJExsRUqgkMGaWSbwYLnoO4T6VgpbQbdELPMBAHWWrhYrcxXnYgAsatPWygkFCBD4K62MAsOTqA6szYRPpsu6e6Y8mPiVrBMNuGIMrgwBUu4p2DgG1Ownu6hpuTv7hScefHAzAC/yRRw5U5pALMbJ4AUALvHSZhxgHPXTsHcdWD1GadAHr9avP+c0wCr7263Df8ASLwXWHWs+KIAAAAHdElNRQfYBQEBODPr Organization: DeuxChevaux.org -- The =?iso-8859-1?Q?Citr?= =?iso-8859-1?B?b+tu?= 2CV Database User-Agent: Mutt/1.5.21 (2010-09-15) Hi, I received the following bug report via Ubuntu's Launchpad: ----- Forwarded message from Thue Janus Kristensen ----- Date: Sat, 12 Sep 2015 21:34:14 -0000 From: Thue Janus Kristensen Subject: [Bug 1495151] [NEW] zsh completion for gphoto2 gives "--delete-files" instead of the correct "--delete-file" Reply-To: Bug 1495151 <1495151@bugs.launchpad.net> […] Public bug reported: Zsh tab completion for gphoto2 has incorrect tab completion for "--delete-file", wrongly appending an "s". The error comes from the file /usr/share/zsh/functions/Completion/Unix/_gphoto2 with the line '--delete-files[delete files given in range]:range' \ ProblemType: Bug DistroRelease: Ubuntu 15.04 Package: zsh-common 5.0.7-5ubuntu1 […] https://bugs.launchpad.net/bugs/1495151 […] ----- End forwarded message ----- I can confirm this by comparing "gphoto2 --help | fgrep delete" with Completion/Unix/_gphoto2 in git. Here's the according patch I'd commit: diff --git a/Completion/Unix/Command/_gphoto2 b/Completion/Unix/Command/_gphoto2 index 95d8a49..314d83e 100644 --- a/Completion/Unix/Command/_gphoto2 +++ b/Completion/Unix/Command/_gphoto2 @@ -32,7 +32,7 @@ _arguments -s \ '--get-all-raw-data[get all raw data from folder]' \ '--get-audio-data[get audio data given in range]:range' \ '--get-all-audio-data[get all audio data from folder]' \ - '--delete-files[delete files given in range]:range' \ + '--delete-file[delete files given in range]:range' \ '--delete-all-files[delete all files in folder]' \ '(-u --upload-file)'{-u,--upload-file}'[upload a file to camera]:file:_files' \ '--capture-preview[capture a quick preview]' \ Kind regards, Axel -- /~\ Plain Text Ribbon Campaign | Axel Beckert \ / Say No to HTML in E-Mail and News | abe@deuxchevaux.org (Mail) X See http://www.nonhtmlmail.org/campaign.html | abe@noone.org (Mail+Jabber) / \ I love long mails: http://email.is-not-s.ms/ | http://abe.noone.org/ (Web)