From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] python3-jmespath: update to 0.9.5
Date: Tue, 06 Oct 2020 13:12:25 +0100
Message-ID: <A4C9A63A-DBAF-47C0-B884-D87469CAAAF5@ipfire.org>
In-Reply-To: <A90249E1-1531-47D3-AD51-4E92EA64B7CD@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8938737058079517544=="
List-Id: <development.lists.ipfire.org>

--===============8938737058079517544==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi,

This one won=E2=80=99t apply because of differences in the rootfile.

Does this belong to a patchset and it isn=E2=80=99t marked as such?

Could you please rebase and submit again?

-Michael

> On 4 May 2020, at 12:21, Michael Tremer <michael.tremer(a)ipfire.org> wrote:
>=20
> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
>=20
>> On 3 May 2020, at 11:11, Peter M=C3=BCller <peter.mueller(a)ipfire.org> wr=
ote:
>>=20
>> Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
>> ---
>> config/rootfiles/packages/python3-jmespath | 11 +++++------
>> lfs/python3-jmespath                       | 10 +++++-----
>> 2 files changed, 10 insertions(+), 11 deletions(-)
>>=20
>> diff --git a/config/rootfiles/packages/python3-jmespath b/config/rootfiles=
/packages/python3-jmespath
>> index 52fd3a4a1..6f0022a13 100644
>> --- a/config/rootfiles/packages/python3-jmespath
>> +++ b/config/rootfiles/packages/python3-jmespath
>> @@ -1,11 +1,10 @@
>> usr/bin/jp.py
>> #usr/lib/python3.8/site-packages/jmespath
>> -#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info
>> -#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info/PKG-INFO
>> -#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info/SOURCES.txt
>> -#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info/dependency=
_links.txt
>> -#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info/pbr.json
>> -#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info/top_level.=
txt
>> +#usr/lib/python3.8/site-packages/jmespath-0.9.5-py3.8.egg-info
>> +#usr/lib/python3.8/site-packages/jmespath-0.9.5-py3.8.egg-info/PKG-INFO
>> +#usr/lib/python3.8/site-packages/jmespath-0.9.5-py3.8.egg-info/SOURCES.txt
>> +#usr/lib/python3.8/site-packages/jmespath-0.9.5-py3.8.egg-info/dependency=
_links.txt
>> +#usr/lib/python3.8/site-packages/jmespath-0.9.5-py3.8.egg-info/top_level.=
txt
>> usr/lib/python3.8/site-packages/jmespath/__init__.py
>> usr/lib/python3.8/site-packages/jmespath/ast.py
>> usr/lib/python3.8/site-packages/jmespath/compat.py
>> diff --git a/lfs/python3-jmespath b/lfs/python3-jmespath
>> index 4db53be67..d49a429a6 100644
>> --- a/lfs/python3-jmespath
>> +++ b/lfs/python3-jmespath
>> @@ -1,7 +1,7 @@
>> ##########################################################################=
#####
>> #                                                                         =
    #
>> # IPFire.org - A linux based firewall                                     =
    #
>> -# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>              =
       #
>> +# Copyright (C) 2007-2020  IPFire Team  <info(a)ipfire.org>              =
       #
>> #                                                                         =
    #
>> # This program is free software: you can redistribute it and/or modify    =
    #
>> # it under the terms of the GNU General Public License as published by    =
    #
>> @@ -24,15 +24,15 @@
>>=20
>> include Config
>>=20
>> -VER        =3D 0.9.3
>> +VER        =3D 0.9.5
>>=20
>> THISAPP    =3D jmespath-$(VER)
>> DL_FILE    =3D $(THISAPP).tar.gz
>> DL_FROM    =3D $(URL_IPFIRE)
>> -DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
>> +DIR_APP    =3D $(DIR_SRC)/jmespath.py-$(VER)
>> TARGET     =3D $(DIR_INFO)/$(THISAPP)
>> PROG       =3D python3-jmespath
>> -PAK_VER    =3D 2
>> +PAK_VER    =3D 3
>>=20
>> DEPS       =3D
>>=20
>> @@ -44,7 +44,7 @@ objects =3D $(DL_FILE)
>>=20
>> $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
>>=20
>> -$(DL_FILE)_MD5 =3D 37a906c06de62bed25ec5cf99cee04a6
>> +$(DL_FILE)_MD5 =3D 81edf8744cade9793164daff3bd16a65
>>=20
>> install : $(TARGET)
>>=20
>> --=20
>> 2.26.1
>=20


--===============8938737058079517544==--