diff -p -up gdb-6.8/gdb/symfile.c.orig gdb-6.8/gdb/symfile.c --- gdb-6.8/gdb/symfile.c.orig 2009-01-21 09:50:47.000000000 -0500 +++ gdb-6.8/gdb/symfile.c 2009-01-21 10:17:36.000000000 -0500 @@ -1779,7 +1779,7 @@ missing_rpm_enlist (const char *filename char *debuginfo, **slot, *s, *s2; errmsg_t err; size_t srcrpmlen = sizeof (".src.rpm") - 1; - size_t debuginfolen = sizeof ("-debuginfo") - 1; + size_t debuginfolen = sizeof ("-debug") - 1; rpmdbMatchIterator mi_debuginfo; h = rpmdbNextIterator (mi); @@ -1788,24 +1788,24 @@ missing_rpm_enlist (const char *filename /* Verify the debuginfo file is not already installed. */ - debuginfo = headerFormat (h, "%{sourcerpm}-debuginfo.%{arch}", &err); + debuginfo = headerFormat (h, "%{sourcerpm}-debug.%{arch}", &err); if (!debuginfo) { warning (_("Error querying the rpm file `%s': %s"), filename, err); continue; } - /* s = `.src.rpm-debuginfo.%{arch}' */ + /* s = `.src.rpm-debug.%{arch}' */ s = strrchr (debuginfo, '-') - srcrpmlen; s2 = NULL; if (s > debuginfo && memcmp (s, ".src.rpm", srcrpmlen) == 0) { - /* s2 = `-%{release}.src.rpm-debuginfo.%{arch}' */ + /* s2 = `-%{release}.src.rpm-debug.%{arch}' */ s2 = memrchr (debuginfo, '-', s - debuginfo); } if (s2) { - /* s2 = `-%{version}-%{release}.src.rpm-debuginfo.%{arch}' */ + /* s2 = `-%{version}-%{release}.src.rpm-debug.%{arch}' */ s2 = memrchr (debuginfo, '-', s2 - debuginfo); } if (!s2) @@ -1815,31 +1815,31 @@ missing_rpm_enlist (const char *filename xfree (debuginfo); continue; } - /* s = `.src.rpm-debuginfo.%{arch}' */ - /* s2 = `-%{version}-%{release}.src.rpm-debuginfo.%{arch}' */ + /* s = `.src.rpm-debug.%{arch}' */ + /* s2 = `-%{version}-%{release}.src.rpm-debug.%{arch}' */ memmove (s2 + debuginfolen, s2, s - s2); - memcpy (s2, "-debuginfo", debuginfolen); + memcpy (s2, "-debug", debuginfolen); /* s = `XXXX.%{arch}' */ /* strlen ("XXXX") == srcrpmlen + debuginfolen */ - /* s2 = `-debuginfo-%{version}-%{release}XX.%{arch}' */ + /* s2 = `-debug-%{version}-%{release}XX.%{arch}' */ /* strlen ("XX") == srcrpmlen */ memmove (s + debuginfolen, s + srcrpmlen + debuginfolen, strlen (s + srcrpmlen + debuginfolen) + 1); - /* s = `-debuginfo-%{version}-%{release}.%{arch}' */ + /* s = `-debug-%{version}-%{release}.%{arch}' */ /* RPMDBI_PACKAGES requires keylen == sizeof (int). */ /* RPMDBI_LABEL is an interface for NVR-based dbiFindByLabel(). */ mi_debuginfo = rpmtsInitIterator (ts, RPMDBI_LABEL, debuginfo, 0); - xfree (debuginfo); if (mi_debuginfo) { rpmdbFreeIterator (mi_debuginfo); + xfree (debuginfo); count = 0; break; } /* The allocated memory gets utilized below for MISSING_RPM_HASH. */ - debuginfo = headerFormat (h, + /*debuginfo = headerFormat (h, "%{name}-%{version}-%{release}.%{arch}", &err); if (!debuginfo) @@ -1847,7 +1847,7 @@ missing_rpm_enlist (const char *filename warning (_("Error querying the rpm file `%s': %s"), filename, err); continue; - } + }*/ /* Base package name for `debuginfo-install'. We do not use the `yum' command directly as the line @@ -1932,8 +1932,7 @@ missing_rpm_list_print (void) qsort (array, missing_rpm_list_entries, sizeof (*array), (int (*) (const void *, const void *)) missing_rpm_list_compar); - printf_unfiltered (_("Missing separate debuginfos, use: %s"), - "debuginfo-install"); + printf_unfiltered (_("Missing debug package(s), you should install:")); for (array_iter = array; array_iter < array + missing_rpm_list_entries; array_iter++) { @@ -2125,10 +2124,10 @@ debug_print_missing (const char *binary, already requires its own separate lines. */ fprintf_unfiltered (gdb_stdlog, - _("Missing separate debuginfo for %s\n"), binary); - if (debug != NULL) + _("Missing separate debug info for %s\n"), binary); + /*if (debug != NULL) fprintf_unfiltered (gdb_stdlog, _("Try: %s %s\n"), - "yum --enablerepo='*-debuginfo' install", debug); + "yum --enablerepo='*-debuginfo' install", debug);*/ } }