From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id D88B8385780F; Fri, 14 Jan 2022 07:44:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D88B8385780F Received: by mail-wr1-x42a.google.com with SMTP id k30so14100282wrd.9; Thu, 13 Jan 2022 23:44:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MUzCw8YFON1z+l/ZDdxTF+vYaitPlvk/6BeSALSNJDQ=; b=rh/M/Gy65xfpfWf5I0MfTKQ22zgdtE1tFc0UOyXznpr5g7w2S4rc8EUnLFu21AbKn6 rahbRHXhUWukdklM2ufrWDtdktYgm9gT6MNKn4UuHLneRdcmTLaQwqjxF+UbyGHvBaFW xAf0E4Z/9geD3KZHOv77tuY5fWQtnCuikL3ASC2Mj6N5kmeHgz9POLvle0o4bbEo10yH 3DUqSsWQkEoNsWv4jIBX//4JqvG5MfJk4fYOHO/O36YEY01Up1wL9vlbcN8ic08F1whe ++E3QAznBfGsCb4wFDw6PLSUHJTudUEAwwYwI50WV/LYW57wV3dAcMCrq7BjYqcIv1i7 4Gxw== X-Gm-Message-State: AOAM532Ly4/MknoiAEMl/ntsgqt2nxiPOjaUD6YcsSNr81dg3UDkMQGa pnSf5yLxb9k7pKSta4y9s2Q= X-Google-Smtp-Source: ABdhPJzDkNxfOCucLFUdVUtR4VEItJC8pgsvXmO3vXRcTAw6YOmGpVJI+gkvu3tvKU6ldH0/d6W9RA== X-Received: by 2002:a5d:440d:: with SMTP id z13mr7409514wrq.585.1642146262844; Thu, 13 Jan 2022 23:44:22 -0800 (PST) Received: from nbbrfq (91-118-142-247.dsl.dynamic.surfer.at. [91.118.142.247]) by smtp.gmail.com with ESMTPSA id a8sm4474725wrx.57.2022.01.13.23.44.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jan 2022 23:44:22 -0800 (PST) Date: Fri, 14 Jan 2022 08:44:18 +0100 From: Bernhard Reutner-Fischer To: Martin =?UTF-8?B?TGnFoWth?= Cc: rep.dot.nop@gmail.com, Jakub Jelinek , GCC Mailing List , Martin Jambor , GCC Patches , gfortran Subject: Re: [PATCH] git-backport: support renamed .cc files in commit message. Message-ID: <20220114084418.3779aea1@nbbrfq> In-Reply-To: <486de71c-d1fc-5ca7-4036-59462a75f116@suse.cz> References: <57564370-7184-ef62-039e-60b150058fd8@suse.cz> <68946bf6-4b2f-b8f3-20b3-5cf3f2fd611c@moene.org> <713a96b5-b82e-ffd7-d03b-7e05a4dede9e@suse.cz> <20220111155657.GA2646553@tucnak> <8a3f6503-7380-13bb-5731-18ff5474f68a@suse.cz> <20220111161636.GB2646553@tucnak> <78c91bbb-34d7-36f6-0d69-d8a4e7f446f5@suse.cz> <486de71c-d1fc-5ca7-4036-59462a75f116@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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: fortran@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Fortran mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jan 2022 07:44:25 -0000 On Wed, 12 Jan 2022 16:54:46 +0100 Martin Li=C5=A1ka wrote: > +def replace_file_in_changelog(lines, filename): > + if not filename.endswith('.cc'): > + return > + > + # consider all componenets of a path: gcc/ipa-icf.cc > + while filename: > + for i, line in enumerate(lines): > + if filename in line: > + line =3D line.replace(filename, filename[:-1]) > + lines[i] =3D line > + return > + parts =3D filename.split('/') > + if len(parts) =3D=3D 1: > + return > + filename =3D '/'.join(parts[1:]) > + I think you mean os.sep instead of the hardcoded slash. But i'd use os.path.split and os.path.join thanks,