From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from re-prd-fep-046.btinternet.com (mailomta31-re.btinternet.com [213.120.69.124]) by sourceware.org (Postfix) with ESMTPS id 91AD83858C78 for ; Sat, 12 Mar 2022 12:59:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 91AD83858C78 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=dronecode.org.uk Authentication-Results: sourceware.org; spf=none smtp.mailfrom=dronecode.org.uk Received: from re-prd-rgout-003.btmx-prd.synchronoss.net ([10.2.54.6]) by re-prd-fep-046.btinternet.com with ESMTP id <20220312125928.BRXH23644.re-prd-fep-046.btinternet.com@re-prd-rgout-003.btmx-prd.synchronoss.net> for ; Sat, 12 Mar 2022 12:59:28 +0000 Authentication-Results: btinternet.com; auth=pass (PLAIN) smtp.auth=jonturney@btinternet.com; bimi=skipped X-SNCR-Rigid: 61A69BAC0CF4304C X-Originating-IP: [86.139.156.65] X-OWM-Source-IP: 86.139.156.65 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-VadeSecure-score: verdict=clean score=0/300, class=clean X-RazorGate-Vade: gggruggvucftvghtrhhoucdtuddrgedvvddruddvgedggeeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuueftkffvkffujffvgffngfevqffopdfqfgfvnecuuegrihhlohhuthemuceftddunecunecujfgurhepkfffgggfuffvfhfhjggtgfesthejredttdefjeenucfhrhhomheplfhonhcuvfhurhhnvgihuceojhhonhdrthhurhhnvgihsegurhhonhgvtghouggvrdhorhhgrdhukheqnecuggftrfgrthhtvghrnhepffekiefgudejheetudeigfejledtleegleetkeduteeftdfffefhueefgfeutedtnecukfhppeekiedrudefledrudehiedrieehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehhvghloheplgduledvrdduieekrddurddutdefngdpihhnvghtpeekiedrudefledrudehiedrieehpdhmrghilhhfrhhomhepjhhonhdrthhurhhnvgihsegurhhonhgvtghouggvrdhorhhgrdhukhdpnhgspghrtghpthhtohepuddprhgtphhtthhopegthihgfihinhdqrghpphhssegthihgfihinhdrtghomh X-RazorGate-Vade-Verdict: clean 0 X-RazorGate-Vade-Classification: clean Received: from [192.168.1.103] (86.139.156.65) by re-prd-rgout-003.btmx-prd.synchronoss.net (5.8.716.04) (authenticated as jonturney@btinternet.com) id 61A69BAC0CF4304C for cygwin-apps@cygwin.com; Sat, 12 Mar 2022 12:59:28 +0000 Message-ID: <7143bdc7-07cc-f631-69f8-141a4dad55cc@dronecode.org.uk> Date: Sat, 12 Mar 2022 12:59:19 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [ITP] git-filter-repo 2.34.0 Content-Language: en-GB To: "cygwin-apps@cygwin.com" References: <20220308092804.vbhtazpcg4yl7dck@lucy.dinwoodie.org> <20220311215420.qyqrnlzdobvoryaj@lucy.dinwoodie.org> From: Jon Turney In-Reply-To: <20220311215420.qyqrnlzdobvoryaj@lucy.dinwoodie.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3570.5 required=5.0 tests=BAYES_00, FORGED_SPF_HELO, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, KAM_NUMSUBJECT, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: cygwin-apps@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin package maintainer discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2022 12:59:30 -0000 On 11/03/2022 21:54, Adam Dinwoodie wrote: > >>> - You're changing the shebang with both a patch file and with a line in >>> src_compile; you don't need to do both! I suspect this is an artefact >>> of how Cygport packages the source files, but AIUI the canonical way >>> to do this sort of patching with Cygport is to drop the sed line from >>> your .cygport file and just keep the patch file that gets generated. >> >> Yeah the patch file was automatically generated when I ran `cygport >> all` and I wasn't sure what to do with it. To me it seems silly to >> have a patch just to change the shebang line when `sed` works fine. >> I'll try removing `sed` to see what happens. > > Cygport automatically generates patches when it detects a difference > between the "src" and "origsrc" directories. You're changing something > in "src", so the patch gets generated. The idea is that you can adjust > things in the src directory by hand, then when you run cygport it'll > automatically store the diffs so you never need to make the same changes > again. You can use DIFF_EXCLUDES to ignore that file for patch generation, if it's being modified in the src_compile(), like this. (which seems to be now present in the cygport when I looked it over)