| Message ID | 20230802072436.1020900-2-alex@linutronix.de |
|---|---|
| State | Accepted, archived |
| Commit | da1284c990957827ee89685921c53b64490a32b2 |
| Headers | show |
| Series | [1/2] devtool/upgrade: raise an error if extracting source produces more than one directory | expand |
On Wed, Aug 2, 2023 at 12:24 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > With newly added recipe_qa task, the function needs to filter out its > output as well. > > The issue wouldn't appear in selftest because it's triggered by > buildhistory and > selftest disables that. > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> Tested-by: Tim Orling <tim.orling@konsulko.com> > > --- > scripts/lib/scriptutils.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/lib/scriptutils.py b/scripts/lib/scriptutils.py > index f7c1bd9e4e2..f433106c9a8 100644 > --- a/scripts/lib/scriptutils.py > +++ b/scripts/lib/scriptutils.py > @@ -277,6 +277,6 @@ def filter_src_subdirs(pth): > Used by devtool and recipetool. > """ > dirlist = os.listdir(pth) > - filterout = ['git.indirectionsymlink', 'source-date-epoch'] > + filterout = ['git.indirectionsymlink', 'source-date-epoch', > 'sstate-install-recipe_qa'] > dirlist = [x for x in dirlist if x not in filterout] > return dirlist > -- > 2.30.2 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#185379): > https://lists.openembedded.org/g/openembedded-core/message/185379 > Mute This Topic: https://lists.openembedded.org/mt/100500738/924729 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > ticotimo@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
diff --git a/scripts/lib/scriptutils.py b/scripts/lib/scriptutils.py index f7c1bd9e4e2..f433106c9a8 100644 --- a/scripts/lib/scriptutils.py +++ b/scripts/lib/scriptutils.py @@ -277,6 +277,6 @@ def filter_src_subdirs(pth): Used by devtool and recipetool. """ dirlist = os.listdir(pth) - filterout = ['git.indirectionsymlink', 'source-date-epoch'] + filterout = ['git.indirectionsymlink', 'source-date-epoch', 'sstate-install-recipe_qa'] dirlist = [x for x in dirlist if x not in filterout] return dirlist
With newly added recipe_qa task, the function needs to filter out its output as well. The issue wouldn't appear in selftest because it's triggered by buildhistory and selftest disables that. Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- scripts/lib/scriptutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)