From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.1 Date: Fri, 6 Dec 2019 15:19:00 +0100 From: Alexey Gladkov To: "Dmitry V. Levin" Message-ID: <20191206141900.mkzonieis6buqgtb@comp-core-i7-2640m-0182e6> Mail-Followup-To: "Dmitry V. Levin" , Aleksei Nikiforov , ALT Devel discussion list References: <20191206111554.80969-1-darktemplar@altlinux.org> <20191206120538.GA25049@altlinux.org> <20191206121216.GB25049@altlinux.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20191206121216.GB25049@altlinux.org> Cc: ALT Devel discussion list , Aleksei Nikiforov Subject: Re: [devel] [PATCH for apt] Fix copying release information from cdrom X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Dec 2019 14:19:08 -0000 Archived-At: List-Archive: List-Post: On Fri, Dec 06, 2019 at 03:12:17PM +0300, Dmitry V. Levin wrote: > On Fri, Dec 06, 2019 at 03:05:38PM +0300, Dmitry V. Levin wrote: > > On Fri, Dec 06, 2019 at 02:15:54PM +0300, Aleksei Nikiforov wrote: > > > --- > > > apt/cmdline/rpmindexcopy.cc | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > >=20 > > > diff --git a/apt/cmdline/rpmindexcopy.cc b/apt/cmdline/rpmindexcopy.cc > > > index 6d5a414..06b391a 100644 > > > --- a/apt/cmdline/rpmindexcopy.cc > > > +++ b/apt/cmdline/rpmindexcopy.cc > > > @@ -180,10 +180,10 @@ bool RPMIndexCopy::CopyPackages(const string &C= DROM,const string &Name,vector > > release.c_str()); > > > string TargetF =3D _config->FindDir("Dir::State::lists") + "par= tial/"; > > > TargetF +=3D URItoFileName(S); > > > - if (FileExists(RipDirectory(*I) + release) =3D=3D true) > > > + if (FileExists(RipDirectory(*I) + "/" + release) =3D=3D true) > > > { > > > FileFd Target(TargetF,FileFd::WriteEmpty); > > > - FileFd Rel(RipDirectory(*I) + release,FileFd::ReadOnly); > > > + FileFd Rel(RipDirectory(*I) + "/" + release,FileFd::ReadOnly= ); > > > if (_error->PendingError() =3D=3D true) > > > return false; > >=20 > > LGTM. > >=20 > > I wonder is there any more bugs in constructing path names in the code. >=20 > I'd also add something like "Fixes: https://bugzilla.altlinux.org/37531". The "Fixes:" is mainly used for commits. Maybe it's better to use "BTS:" ? --=20 Rgrds, legion