From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Fri, 6 Dec 2019 15:12:17 +0300 From: "Dmitry V. Levin" To: Aleksei Nikiforov Message-ID: <20191206121216.GB25049@altlinux.org> References: <20191206111554.80969-1-darktemplar@altlinux.org> <20191206120538.GA25049@altlinux.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="61jdw2sOBCFtR2d/" Content-Disposition: inline In-Reply-To: <20191206120538.GA25049@altlinux.org> Cc: ALT Devel discussion list 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 12:12:17 -0000 Archived-At: List-Archive: List-Post: --61jdw2sOBCFtR2d/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 &CDR= OM,const string &Name,vector > release.c_str()); > > string TargetF =3D _config->FindDir("Dir::State::lists") + "parti= al/"; > > 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. I'd also add something like "Fixes: https://bugzilla.altlinux.org/37531". --=20 ldv --61jdw2sOBCFtR2d/ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCAAGBQJd6kWgAAoJEAVFT+BVnCUIr24P+gKHqrEKdN3SvZqPZWfqHZDX yUNmRVbGFYPZPL0QjMmEELMgg+z8GDk4vbbNR2WkbVF20Wrq01G2o33N3F+U2f2S JMu03IhxU+EFKH5MpRn33QNZukpYmdwv47lGyiL/47BR8esUEkksyIDPZ+jR8AHO s2zdccEvnH35BUcgWTfUUsRI1hogCobjcr2+2MUkIY4VCmKe9q1Nz8p6al+8gCP/ Ou2P4i8bZ1M5pYvP9FMBLsODjhVkiow2ofa9R1/Ad0aQNW29eiJuBN6LI/nhy4h5 zZ516qDf2T9ea1HmRnXw8krZ5JpQJArxyr/EhZm7vh64158LxUcLEj5xxQ5mc4p9 32z262kt8jFLZHxo4kAcRmgMLxiBoZjLu5QivJWo/BUS+lTGrElkTz6oWyyRG4Ks dTYow56aJfmucC34qFE+30LymyHi9uXHclVmaAHI1aFdPMYQxEvZTZVeAjzpO4mV GZqQap/kzd7yUW0E7boLONa0m4lcYv8R7haDPYf00S9hrPSps4TV4lsfIQ3hNy9R UaJexzA/N+H+JmZOyMKS2EFmfUsYl9prLpQ5k5hZXw9Lq/DJm+NP86A2SpcJFNxG /5osJqVORmHxtYXL3PhkGkxniys/jVJKdW0d6Mvr38KUOF/HbdSoTrTJx1duTgJb EXjIPL+CUy0SqdQY4kBW =NF7V -----END PGP SIGNATURE----- --61jdw2sOBCFtR2d/--