X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch;h=985cb6a5d99839e96fd0464d5b359a77e49f98c5;hb=77d1099;hp=f228577d694cec999fcdede955f9755720b1f8c7;hpb=4b0e5c1bdb8bb8711a8994ccd38895107a2fe662;p=packages%2Fgdb.git

diff --git a/gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch b/gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
index f228577..985cb6a 100644
--- a/gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+++ b/gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
@@ -4,8 +4,6 @@ Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: 
  gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
 
-FileName: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
-
 ;; Fix 'gdb gives highly misleading error when debuginfo pkg is present,
 ;; but not corresponding binary pkg' (RH BZ 981154).
 ;;=push+jan
@@ -26,31 +24,9 @@ Comments by Sergio Durigan Junior <sergiodj@redhat.com>:
   and had a little thinko there.  The variable 'filename' needs to be set to
   NULL after it is free'd, otherwise the code below thinks that it is still
   valid and doesn't print the necessary warning ("Try: yum install ...").
----
- gdb/build-id.c                                     |  5 +-
- .../rhbz981154-misleading-yum-install-warning.exp  | 97 ++++++++++++++++++++++
- 2 files changed, 101 insertions(+), 1 deletion(-)
- create mode 100644 gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp
 
-diff --git a/gdb/build-id.c b/gdb/build-id.c
-index 409a5b8c54..e2c1e81266 100644
---- a/gdb/build-id.c
-+++ b/gdb/build-id.c
-@@ -592,7 +592,10 @@ build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id,
- 	  do_cleanups (inner);
- 
- 	  if (abfd == NULL)
--	    continue;
-+	    {
-+	      filename = NULL;
-+	      continue;
-+	    }
- 
- 	  if (build_id_verify (abfd.get(), build_id_len, build_id))
- 	    break;
 diff --git a/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp b/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp
 new file mode 100644
-index 0000000000..bb70c5cf44
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp
 @@ -0,0 +1,97 @@
@@ -151,6 +127,3 @@ index 0000000000..bb70c5cf44
 +
 +# Leaving the link there will cause breakage in the next run.
 +remote_exec build "rm -f [standard_output_file ${build_id_without_debug}]"
--- 
-2.14.3
-