From fb7ac09a36b487ecf5f94d397e9f083e4c20af38 Mon Sep 17 00:00:00 2001 From: Jarek Prokop Date: Wed, 19 Apr 2023 13:09:21 +0200 Subject: [PATCH] Fix import. Reset the branch state due to improper import. RHEL git ref that the branch was reset to . Summary: * `.gitignore` Loosen the matching rules. * `*.patch` Delete patches wrongly imported from another repository. Related: rhbz#2149262 --- .gitignore | 6 ++--- ....3-fix-assertion-mariadb-connector-c.patch | 22 ------------------- 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 rubygem-mysql2-0.5.3-fix-assertion-mariadb-connector-c.patch diff --git a/.gitignore b/.gitignore index 5d357e5..0ccd823 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -SOURCES/mysql2-0.5.3-tests.txz -SOURCES/mysql2-0.5.3.gem -/mysql2-0.5.3-tests.txz -/mysql2-0.5.3.gem +/mysql2-*-tests.txz +/mysql2-*.gem diff --git a/rubygem-mysql2-0.5.3-fix-assertion-mariadb-connector-c.patch b/rubygem-mysql2-0.5.3-fix-assertion-mariadb-connector-c.patch deleted file mode 100644 index 7707d01..0000000 --- a/rubygem-mysql2-0.5.3-fix-assertion-mariadb-connector-c.patch +++ /dev/null @@ -1,22 +0,0 @@ -From cca57b97ad6d1b1b985376be110b89d2b487dea6 Mon Sep 17 00:00:00 2001 -From: Aaron Patterson -Date: Tue, 30 Nov 2021 12:59:43 -0800 -Subject: [PATCH] fix assertion on maria - -downgrade psych ---- - spec/mysql2/client_spec.rb | 2 +- - -diff --git a/spec/mysql2/client_spec.rb b/spec/mysql2/client_spec.rb -index 1519e0f5d..41fb834bf 100644 ---- a/spec/mysql2/client_spec.rb -+++ b/spec/mysql2/client_spec.rb -@@ -573,7 +573,7 @@ def run_gc - end - expect do - @client.query("SELECT SLEEP(1)") -- end.to raise_error(Mysql2::Error, /Lost connection to MySQL server/) -+ end.to raise_error(Mysql2::Error, /Lost connection/) - - if RUBY_PLATFORM !~ /mingw|mswin/ - expect do