From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ldv@altlinux.org>
Date: Fri, 6 Dec 2019 15:05:38 +0300
From: "Dmitry V. Levin" <ldv@altlinux.org>
To: Aleksei Nikiforov <darktemplar@altlinux.org>
Message-ID: <20191206120538.GA25049@altlinux.org>
References: <20191206111554.80969-1-darktemplar@altlinux.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="EVF5PPMfhYS0aIcm"
Content-Disposition: inline
In-Reply-To: <20191206111554.80969-1-darktemplar@altlinux.org>
Cc: ALT Devel discussion list <devel@lists.altlinux.org>
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 <devel@lists.altlinux.org>
List-Id: ALT Linux Team development discussions <devel.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/options/devel>,
 <mailto:devel-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/devel>
List-Post: <mailto:devel@lists.altlinux.org>
List-Help: <mailto:devel-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
 <mailto:devel-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Dec 2019 12:05:38 -0000
Archived-At: <http://lore.altlinux.org/devel/20191206120538.GA25049@altlinux.org/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>


--EVF5PPMfhYS0aIcm
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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 &CDROM=
,const string &Name,vector<st
>  		     release.c_str());
>  	    string TargetF =3D _config->FindDir("Dir::State::lists") + "partial=
/";
>  	    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;

LGTM.

I wonder is there any more bugs in constructing path names in the code.


--=20
ldv

--EVF5PPMfhYS0aIcm
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIcBAEBCAAGBQJd6kQRAAoJEAVFT+BVnCUIy6wQAO9uvd47azUFcW6X1N2hA+FR
9BuOwOxt4Vj6yNksLqFTys6qVdWfcQ0hgkPZIr2MlEC8G1wPeP3Em0Xej4IwiWFV
GzByFiZ0xntCejnfey85moTXee8zRhXoXXhr+2kHkXDl1eSn90b4DMLx6djmc3th
jutLc6n0I1Mw98Vw781ihLd71L0UvaWo0TduyuiU52+Z/88vRi8RWNJBMONJtu0+
ocoOZavjNrLgBXm4xxOj6bjFS9WzhM7eWSSkVMKeLeFq3a5LQuiKLZiHYbG2l00E
iNCUf/3ebKXJ1dzvghgKM9UoJYnlg9kRNjXMUrWviqqA20AQEKtp15RTbYXuwfm0
3wBu/b91WvjOJHsFBNBiTvT7PWZyA+tCZpxBj8RI/DCQYgs9LcIJZvPUL4XeTlqe
sn4iM4DYpKAvtSpk3y3jG85x7bxhohVWeAyXMWGAy3e9dy7FJTe4B5jEAhHZ0CaX
K5JvCDh0cYIGGQKcvb+gYsVTvHPOXw1jFvkAlCPz/gcUGcSOsXomjtPcabUH5lZ5
V9hEq8H5xHUGrUfHC4SyeamEuLEykLhRKdu/JybPt9BDRb4V7SB3eJy14C9fBR2F
2mZjWp4Y1vR7NuKZxoP25pyYs26gGIaNGswvUvQqG8zL8xX7wqiPNyHDeV6Izun8
wxmcXyvb3ZFScuazFDSE
=KqLR
-----END PGP SIGNATURE-----

--EVF5PPMfhYS0aIcm--