From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2666 invoked from network); 3 Aug 2009 19:57:52 -0000 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 Received: from new-brage.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.254.104) by ns1.primenet.com.au with SMTP; 3 Aug 2009 19:57:52 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 62879 invoked from network); 3 Aug 2009 19:57:43 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 3 Aug 2009 19:57:43 -0000 Received: (qmail 16624 invoked by alias); 3 Aug 2009 19:57:38 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 27204 Received: (qmail 16603 invoked from network); 3 Aug 2009 19:57:38 -0000 Received: from bifrost.dotsrc.org (130.225.254.106) by sunsite.dk with SMTP; 3 Aug 2009 19:57:38 -0000 Received: from mail-ew0-f209.google.com (mail-ew0-f209.google.com [209.85.219.209]) by bifrost.dotsrc.org (Postfix) with ESMTP id 63E5780F77DD for ; Mon, 3 Aug 2009 21:57:34 +0200 (CEST) Received: by ewy5 with SMTP id 5so3216460ewy.39 for ; Mon, 03 Aug 2009 12:57:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:content-type :content-transfer-encoding; bh=2Cf3AKcNPmB9MJf2qdMucCjsPeSjCYPEBWx4LpbkV2M=; b=VzrezLPiJc0OErnijUR9BxIQNSnK1MGCnZvvmlyu3TVRYOTkBaOGi9G+SbrOTYpidb lL17oRLKTvQgNF6yRTV3xZEHtmZSXko4M5Iww0xt3mTOj0cSCFUD5egYNywrHtQ0S3Az c9126WMCLR5mIv4BGdkUHAZnRPFDj+DTkfkH0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; b=Cn+bJ0iOYXfl89LoOOiS8jXSN5LzLvr2U9vsaJYqap8XNO/5Ir4j8egBN9DLcJsDZw iEg3dAP+jzSu1SBGq3AKLWirCzftPLatjpe1U+EMzevY9zROxRsBo2k7Jz42QKebubsy zQfRqX0q0fLLbE0blK5/Sv5hH30UKXvN21UGI= MIME-Version: 1.0 Received: by 10.211.201.8 with SMTP id d8mr5562813ebq.50.1249329453857; Mon, 03 Aug 2009 12:57:33 -0700 (PDT) In-Reply-To: <20090212184212.GB25459@scru.org> References: <20090212091634.GA17364@piper.oerlikon.madduck.net> <20090212184212.GB25459@scru.org> Date: Mon, 3 Aug 2009 21:57:33 +0200 Message-ID: <237967ef0908031257j32b594a3y2c561c660f7eff62@mail.gmail.com> Subject: Re: Bug#514955: patch completion broken: bad set of key/value pairs for associative array From: Mikael Magnusson To: zsh-workers@sunsite.dk, 514955@bugs.debian.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV 0.94.2/9648/Mon Aug 3 15:27:08 2009 on bifrost X-Virus-Status: Clean 2009/2/12 Clint Adams : > On Thu, Feb 12, 2009 at 10:16:34AM +0100, martin f krafft wrote: >> piper:~|master|.tmp/cdt.lalFLHgV/puppet-0.24.7% patch lib/ >> _patch:11: bad set of key/value pairs for associative array >> _patch:11: bad set of key/value pairs for associative array >> _patch:11: bad set of key/value pairs for associative array >> _patch:11: bad set of key/value pairs for associative array >> piper:~|master|.tmp/cdt.lalFLHgV/puppet-0.24.7% patch lib/ > > Oops. > > Index: Completion/Unix/Command/_patch > =================================================================== > RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_patch,v > retrieving revision 1.3 > diff -u -r1.3 _patch > --- Completion/Unix/Command/_patch 29 Jan 2009 15:54:43 -0000 1.3 > +++ Completion/Unix/Command/_patch 12 Feb 2009 18:41:06 -0000 > @@ -113,7 +113,8 @@ > '* --use-index-line *' '--use-index-line[deal with Index: line]' > '* --patch-root=DIR *' '--patch-root=[restrict paths]:patch root:_files -/' > > - '* -U --unified-reject-files *' '(-U --unified-reject-files)'{-U,--unified-reject-files}'[create unified reject files]' > + '* -U *' '(--unified-reject-files)-U[create unified reject files]' > + '* --unified-reject-files *' '(-U)--unified-reject-files}[create unified reject files]' > '* --global-reject-file=file *' '--global-reject-file=[put all rejects into one file]:file:_files' > ) > _patch_args=( There's a stray } there. diff --git a/Completion/Unix/Command/_patch b/Completion/Unix/Command/_patch --- a/Completion/Unix/Command/_patch +++ b/Completion/Unix/Command/_patch @@ -114,7 +114,7 @@ if (( ! $+_patch_args )); then '* --patch-root=DIR *' '--patch-root=[restrict paths]:patch root:_files -/' '* -U *' '(--unified-reject-files)-U[create unified reject files]' - '* --unified-reject-files *' '(-U)--unified-reject-files}[create unified reject files]' + '* --unified-reject-files *' '(-U)--unified-reject-files[create unified reject files]' '* --global-reject-file=file *' '--global-reject-file=[put all rejects into one file]:file:_files' ) _patch_args=( -- Mikael Magnusson