[rpms/gdb] gdb-17.2-rebase-f44: Remove 'set/show build-id-verbose' setting from GDB

[rpms/gdb] gdb-17.2-rebase-f44: Remove 'set/show build-id-verbose' setting from GDB

[Andrew Burgess]

            A new commit has been pushed.

            Repo   : rpms/gdb
            Branch : gdb-17.2-rebase-f44
            Commit : 41704284b729372e63c537ff5c7e98edac5d407b
            Author : Andrew Burgess <aburgess@redhat.com>
            Date   : 2024-12-11T14:03:47+00:00
            Stats  : +17/-36 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/gdb/c/41704284b729372e63c537ff5c7e98edac5d407b?branch=gdb-17.2-rebase-f44

            Log:
            Remove 'set/show build-id-verbose' setting from GDB

This commit removes the 'set/show build-id-verbose' setting.  Users
should instead use the 'set/show rpm-suggestion enabled' setting.

The build-id-verbose setting was an integer, but only 0 or 1 had
meaning, with 0 turning off rpm suggestions, and 1, the default,
turning on rpm suggestion.

The new 'rpm-suggestion enabled' setting is a boolean, the default is
'on' which provides rpm suggestions, while 'off' disables rpm
suggestions.

The old setting was undocumented.  The new setting has a manual entry,
so users can learn about it through 'info gdb' for example.

This change could potentially break existing user scripts, users will
need to update their scripts like this:

  'set build-id-verbose 0' becomes 'set rpm-suggestion enabled off'

and:

  'set build-id-verbose 1' becomes 'set rpm-suggestion enabled on'

---
diff --git a/gdb-6.6-buildid-locate-tests.patch b/gdb-6.6-buildid-locate-tests.patch
index 2cae49f..2a7f1d3 100644
--- a/gdb-6.6-buildid-locate-tests.patch
+++ b/gdb-6.6-buildid-locate-tests.patch
@@ -222,8 +222,8 @@ new file mode 100644
 +# Reinitialize GDB and see if we get a dnf suggestion.
 +clean_restart
 +
-+gdb_test "set build-id-verbose 1" "" \
-+    "set build-id-verbose"
++gdb_test "set rpm-suggestion enabled on" "" \
++    "turn on rpm-suggestion feature"
 +
 +# GDB only makes build-id based RPM suggestions if /usr/lib is in
 +# the debug-file-directory list, the reason being that system RPMs

diff --git a/gdb-add-rpm-suggestion-script.patch b/gdb-add-rpm-suggestion-script.patch
index 2ef2eb4..98af468 100644
--- a/gdb-add-rpm-suggestion-script.patch
+++ b/gdb-add-rpm-suggestion-script.patch
@@ -149,7 +149,7 @@ diff --git a/gdb/python/lib/gdb/command/rpm-suggestions.py b/gdb/python/lib/gdb/
 new file mode 100644
 --- /dev/null
 +++ b/gdb/python/lib/gdb/command/rpm-suggestions.py
-@@ -0,0 +1,552 @@
+@@ -0,0 +1,525 @@
 +# Copyright 2023 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -287,19 +287,12 @@ new file mode 100644
 +
 +    # Return True if rpm-suggestion is disabled for any reason.
 +    def rpm_suggestion_is_disabled():
-+        global param_build_id_verbose
-+
 +        # If /usr/lib/ is not being used to find debug information
 +        # then there's no point offering any RPMs as GDB would not
 +        # find the newly installed content.
 +        if not using_suitable_debug_file_directory():
 +            return True
 +
-+        # For backwards compatibility, if build-id-verbose is set to
-+        # zero, then disable RPM suggestion.
-+        if param_build_id_verbose.value == 0:
-+            return True
-+
 +        # Is 'rpm-suggestion enabled' set to 'off'?
 +        if not param_rpm_suggestion_enabled.value:
 +            return True
@@ -682,26 +675,6 @@ new file mode 100644
 +
 +# Create the 'info rpm-suggestions' commands.
 +rpm_suggestion_info()
-+
-+# Create the 'build-id-verbose' parameter.  This is implemented as an
-+# integer for backward compatibility reasons.  It would be nice to
-+# convert this to a boolean, but it's not clear if that will break
-+# existing users uses of this flag.
-+
-+class build_id_verbose(gdb.Parameter):
-+    """
-+    Level 0 disable printing the missing debug filesname,
-+    Level 1 (default) enables printing the missing debug filenames,
-+    """
-+
-+    set_doc = "Set debugging level of the build-id locator."
-+    show_doc = "Show debugging level of the build-id locator."
-+
-+    def __init__(self):
-+        super().__init__("build-id-verbose", gdb.COMMAND_NONE, gdb.PARAM_ZINTEGER)
-+        self.value = 1
-+
-+param_build_id_verbose = build_id_verbose()
 diff --git a/gdb/testsuite/gdb.base/gdbinit-history.exp b/gdb/testsuite/gdb.base/gdbinit-history.exp
 --- a/gdb/testsuite/gdb.base/gdbinit-history.exp
 +++ b/gdb/testsuite/gdb.base/gdbinit-history.exp
@@ -711,7 +684,7 @@ diff --git a/gdb/testsuite/gdb.base/gdbinit-history.exp b/gdb/testsuite/gdb.base
  
 -    set common_history [list "set height 0" "set width 0"]
 +    set common_history [list "set height 0" "set width 0" \
-+			    "set build-id-verbose 0"]
++			    "set rpm-suggestion enabled off"]
  
      set test_dir [standard_output_file history_test]
      remote_exec host "mkdir -p $test_dir"
@@ -760,7 +733,7 @@ diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
  		   {-iex "set height 0"} \
 -		   {-iex "set width 0"}]]
 +		   {-iex "set width 0"} \
-+		   {-iex "set build-id-verbose 0"}]]
++		   {-iex "set rpm-suggestion enabled off"}]]
  
      # If DEBUGINFOD_URLS is set, gdb will try to download sources and
      # debug info for f.i. system libraries.  Prevent this.
@@ -770,7 +743,7 @@ diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
  
 +    # Turn off the missing debug info messages as the testsuite does
 +    # not expect them.
-+    send_gdb "set build-id-verbose 0\n"
++    send_gdb "set rpm-suggestion enabled off\n"
 +    gdb_expect 10 {
 +	-re "$gdb_prompt $" {
 +	    verbose "Disabled the missing debug info messages." 2
@@ -792,9 +765,9 @@ diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
      }
 +    # Turn off the missing debug info messages as the testsuite does
 +    # not expect them.
-+    send_gdb "190-gdb-set build-id-verbose 0\n"
++    send_gdb "190-gdb-set rpm-suggestion enabled off\n"
 +    gdb_expect 10 {
-+	-re ".*190-gdb-set build-id-verbose 0\r\n190\\\^done\r\n$mi_gdb_prompt$" {
++	-re ".*190-gdb-set rpm-suggestion enabled off\r\n190\\\^done\r\n$mi_gdb_prompt$" {
 +	    verbose "Disabled the missing debug info messages." 2
 +	}
 +	timeout {

diff --git a/gdb.spec b/gdb.spec
index 2230fd6..bed4e82 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -45,7 +45,7 @@ Version: 15.2
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPL-3.0-or-later AND BSD-3-Clause AND FSFAP AND LGPL-2.1-or-later AND GPL-2.0-or-later AND LGPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain AND GFDL-1.3-or-later AND LGPL-2.0-or-later WITH GCC-exception-2.0 AND GPL-3.0-or-later WITH GCC-exception-3.1 AND GPL-2.0-or-later WITH GNU-compiler-exception
 # Do not provide URL for snapshots as the file lasts there only for 2 days.
@@ -929,6 +929,14 @@ fi
 
 %changelog
 * Wed Dec 11 2024 Andrew Burgess <aburgess@redhat.com>
+- This REMOVES the 'set/show build-id-verbose' command.  Users should
+  instead use 'set/show rpm-suggestion enabled'.  The old
+  build-id-verbose setting took an integer, but only 0 or 1 had
+  meaning.  The new setting is a boolean, and takes 'on' or 'off'.
+  The old setting was undocumented, while the new setting has a manual
+  entry.
+
+* Wed Dec 11 2024 Andrew Burgess <aburgess@redhat.com>
 - Remove gdb-add-deprecated-settings-py-script.patch.  This REMOVES
   the 'set/show build-id-core-load' setting from GDB.  This setting
   has had no effect on GDB since commit a5d2c85367e544d446 back in