From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Fri, 6 Dec 2019 23:14:42 +0300 From: "Dmitry V. Levin" To: ALT Devel discussion list Message-ID: <20191206201442.GC30556@altlinux.org> References: <20191206111554.80969-1-darktemplar@altlinux.org> <20191206120538.GA25049@altlinux.org> <20191206121216.GB25049@altlinux.org> <20191206141900.mkzonieis6buqgtb@comp-core-i7-2640m-0182e6> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="eHhjakXzOLJAF9wJ" Content-Disposition: inline In-Reply-To: <20191206141900.mkzonieis6buqgtb@comp-core-i7-2640m-0182e6> Cc: 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 20:14:42 -0000 Archived-At: List-Archive: List-Post: --eHhjakXzOLJAF9wJ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Dec 06, 2019 at 03:19:00PM +0100, Alexey Gladkov wrote: > 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= =2Ecc > > > > index 6d5a414..06b391a 100644 > > > > --- a/apt/cmdline/rpmindexcopy.cc > > > > +++ b/apt/cmdline/rpmindexcopy.cc > > > > @@ -180,10 +180,10 @@ bool RPMIndexCopy::CopyPackages(const string = &CDROM,const string &Name,vector > > > release.c_str()); > > > > string TargetF =3D _config->FindDir("Dir::State::lists") + "p= artial/"; > > > > 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::ReadOn= ly); > > > > if (_error->PendingError() =3D=3D true) > > > > return false; > > >=20 > > > LGTM. > > >=20 > > > I wonder is there any more bugs in constructing path names in the cod= e. > >=20 > > I'd also add something like "Fixes: https://bugzilla.altlinux.org/37531= ". >=20 > The "Fixes:" is mainly used for commits. Maybe it's better to use "BTS:" ? I think the most traditional prefix for this is "Resolves: ". --=20 ldv --eHhjakXzOLJAF9wJ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCAAGBQJd6raxAAoJEAVFT+BVnCUIOyEP/RzVgnxwoVh8RciNvnhGqzp/ MEK4MFWHWK6rBDIVFJSCp4h5kK7dfqUWAujAPC2er4sXc8KWFAsQKM2fBry0fwvt gRaJ339XCDY30zQtsCCcegO7i6WjuEO8jkGyIOF/fsgzwburUC6ZjzBiMts/iOvw SXeuoUbmCvv73HWnvI+NbOEWejU1tNqn7LwDQCZGWhZcLfjpZrbTryaSQk8uAoIm 4JbixyiQyWAH2mwhkO+rkfIQpda3Bf6f5n1yFB0LoaYEoyJ7RY+FZrlg68NP4gaj 5p5CrtrI0sOa2EQ3sVIkzH566CjuvHFPq6u7sAE3LHONAEdeMYYULUgI5DJfwEhr s0nb6dODpzZsb3GJaVKr07D92tFkCOkpO1XNJX9jCCWP9ihw/kPnqI4UeQ+FMqdP dt3JusCHbicRfdXtW6J4drsaHuFu2VG64Gy2NKhVLdsd4oYfnTpX/rxq2a0NOlzL NtrkAUMUFwA2qM9GhcA/xc7MRmu2i8cr973vVsGjGSKc1braRG0LjwFm88RDDOeL IbBjj0LIn7MTPG8jOJGp5DtvFuz7Mh/kmIUmC6Xd+/8KOfUtD+S34yMU/Rwq6z1o ax3PgVe6FfMu3hjHkcEkwPQiKXtEkf6Ncm1fS6MzXIGf45mmqT10xTb06qKEkWXm 0bzlbMBBXDoVDfbUnbaq =hZYC -----END PGP SIGNATURE----- --eHhjakXzOLJAF9wJ--