Yes, I believe it is. If you cherry-pick it from master, then you should change the Upstream-Status as per below to Accepted.
//Peter > -----Original Message----- > From: Steve Sakoman <sako...@gmail.com> > Sent: den 11 maj 2020 16:21 > To: Peter Kjellerstedt <peter.kjellerst...@axis.com> > Cc: Patches and discussions about the oe-core layer <openembedded- > c...@lists.openembedded.org> > Subject: Re: [OE-core] [meta-oe][PATCH v2] libdnf: Use single-quotes > around string literals used in SQL statements > > Hi Peter, > > Is this patch suitable for inclusion in dunfell lts? > > Thanks, > > Steve > > On Mon, May 4, 2020 at 6:20 AM Peter Kjellerstedt > <peter.kjellerst...@axis.com> wrote: > > > > If sqlite is built with -DSQLITE_DQS=0 in accordance with > > https://sqlite.org/quirks.html#dblquote, migration to version 1.2 of > the > > history database would fail with: > > > > History database cannot be created: .../var/lib/dnf/history.sqlite. > > Error: SQLite error on ":memory:": Executing an SQL statement failed: > > no such column: 1.2 > > > > Signed-off-by: Peter Kjellerstedt <p...@axis.com> > > --- > > > > PATCH v2: Updated the Upstream-Status to Accepted. > > > > ...s-around-string-literals-used-in-SQL.patch | 36 +++++++++++++++++++ > > meta/recipes-devtools/libdnf/libdnf_0.47.0.bb | 1 + > > 2 files changed, 37 insertions(+) > > create mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-Use- > single-quotes-around-string-literals-used-in-SQL.patch > > > > diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Use-single- > quotes-around-string-literals-used-in-SQL.patch b/meta/recipes- > devtools/libdnf/libdnf/0001-Use-single-quotes-around-string-literals- > used-in-SQL.patch > > new file mode 100644 > > index 0000000000..293bdcdd24 > > --- /dev/null > > +++ b/meta/recipes-devtools/libdnf/libdnf/0001-Use-single-quotes- > around-string-literals-used-in-SQL.patch > > @@ -0,0 +1,36 @@ > > +From 96ca7d0049461df2293dd0000edcbc69b64255e0 Mon Sep 17 00:00:00 2001 > > +From: Peter Kjellerstedt <p...@axis.com> > > +Date: Sun, 3 May 2020 22:40:39 +0200 > > +Subject: [PATCH] Use single-quotes around string literals used in SQL > > + statements > > + > > +If sqlite is built with -DSQLITE_DQS=0 in accordance with > > +https://sqlite.org/quirks.html#dblquote, migration to version 1.2 of > the > > +history database would fail with: > > + > > + History database cannot be created: /var/lib/dnf/history.sqlite. > > + Error: SQLite error on ":memory:": Executing an SQL statement > failed: > > + no such column: 1.2 > > + > > +Upstream-Status: Accepted [https://github.com/rpm-software- > management/libdnf/pull/951] > > +Signed-off-by: Peter Kjellerstedt <p...@axis.com> > > +--- > > + libdnf/transaction/sql/migrate_tables_1_2.sql | 4 ++-- > > + 1 file changed, 2 insertions(+), 2 deletions(-) > > + > > +diff --git a/libdnf/transaction/sql/migrate_tables_1_2.sql > b/libdnf/transaction/sql/migrate_tables_1_2.sql > > +index 49b75315..f80ad1c4 100644 > > +--- a/libdnf/transaction/sql/migrate_tables_1_2.sql > > ++++ b/libdnf/transaction/sql/migrate_tables_1_2.sql > > +@@ -1,9 +1,9 @@ > > + R"**( > > + BEGIN TRANSACTION; > > + ALTER TABLE trans > > +- ADD comment TEXT DEFAULT ""; > > ++ ADD comment TEXT DEFAULT ''; > > + UPDATE config > > +- SET value = "1.2" > > ++ SET value = '1.2' > > + WHERE key = 'version'; > > + COMMIT; > > + )**" > > diff --git a/meta/recipes-devtools/libdnf/libdnf_0.47.0.bb > b/meta/recipes-devtools/libdnf/libdnf_0.47.0.bb > > index 1b4b7e4233..1b06d66b19 100644 > > --- a/meta/recipes-devtools/libdnf/libdnf_0.47.0.bb > > +++ b/meta/recipes-devtools/libdnf/libdnf_0.47.0.bb > > @@ -8,6 +8,7 @@ SRC_URI = "git://github.com/rpm-software- > management/libdnf;branch=dnf-4-master \ > > file://0001-Get-parameters-for-both-libsolv-and-libsolvext- > libdn.patch \ > > file://0001-Add-WITH_TESTS-option.patch \ > > file://0001-Look-fo-sphinx-only-if-documentation-is- > actually-ena.patch \ > > + file://0001-Use-single-quotes-around-string-literals-used- > in-SQL.patch \ > > " > > > > SRCREV = "8330eea6985c4e4b53796f858de5b6b38b1ddf5c" > > -- > > 2.21.1 > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138137): https://lists.openembedded.org/g/openembedded-core/message/138137 Mute This Topic: https://lists.openembedded.org/mt/73978808/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
