X-Spam-Check-By: sourceware.org
Message-ID: <459F6F23.7020902@cwilson.fastmail.fm>
Date: Sat, 06 Jan 2007 04:42:59 -0500
From: Charles Wilson <cygwin AT cwilson DOT fastmail DOT fm>
User-Agent: Thunderbird 1.5.0.9 (Windows/20061207)
MIME-Version: 1.0
To: cygwin AT cygwin DOT com
Subject: [patch] cygport-0.2.7 bugfix for apply_patch
Content-Type: multipart/mixed;  boundary="------------060106020306060701000500"
Mailing-List: contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Id: <cygwin.cygwin.com>
List-Subscribe: <mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive: <http://sourceware.org/ml/cygwin/>
List-Post: <mailto:cygwin AT cygwin DOT com>
List-Help: <mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender: cygwin-owner AT cygwin DOT com
Mail-Followup-To: cygwin AT cygwin DOT com
Delivered-To: mailing list cygwin AT cygwin DOT com

--------------060106020306060701000500
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

The recent change in apply_patch has a small bug, fixed by the attached.

2006-01-05  Charles Wilson  <...>

	* bin/cygport.in (apply_patch): use correct variable name

--
Chuck

--------------060106020306060701000500
Content-Type: text/plain;
 name="cygport-applypatch-bugfix.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cygport-applypatch-bugfix.patch"

--- bin/cygport.in	2007-01-06 00:30:50.593750000 -0500
+++ bin/cygport.in	2007-01-06 04:26:46.093750000 -0500
@@ -551,10 +551,10 @@
 
 		while (( patchlevel <= 3 ))
 		do
-			if patch -N -s --dry-run -p${patchlevel} -i ${patchfile} &> /dev/null
+			if patch -N -s --dry-run -p${patchlevel} -i ${patchfile_path} &> /dev/null
 			then
 				inform "applying patch ${patchfile_name}:";
-				patch -N -p${patchlevel} -i ${patchfile} || error "patch ${patchfile_name} failed"
+				patch -N -p${patchlevel} -i ${patchfile_path} || error "patch ${patchfile_name} failed"
 				break;
 			else
 				if (( patchlevel == 3 ))


--------------060106020306060701000500
Content-Type: text/plain; charset=us-ascii

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Problem reports:       http://cygwin.com/problems.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/
--------------060106020306060701000500--