Skip to content

Commit 953f7fb

Browse files
committed
feat(ospackage): trim RPM package names in DOT file visualization
- Extract base package names (e.g., 'libgcrypt' instead of 'libgcrypt-1.10.3-1.azl3.x86_64.rpm') - Apply extractBasePackageNameFromFile() to both node IDs and labels - Apply same trimming to dependency edges for consistency - Makes RPM dot files consistent with Debian packages for cleaner visualization - Dot file is visualization-only, does not affect build logic or package resolution
1 parent d8fb66f commit 953f7fb

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

internal/ospackage/rpmutils/resolver.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,23 @@ func GenerateDot(pkgs []ospackage.PackageInfo, file string, pkgSources map[strin
6666
if pkg.Name == "" {
6767
continue
6868
}
69-
if _, err := fmt.Fprintf(writer, " \"%s\";\n", pkg.Name); err != nil {
70-
return fmt.Errorf("writing DOT node for %s: %w", pkg.Name, err)
69+
// Extract clean package name for display (e.g., "libgcrypt" instead of "libgcrypt-1.10.3-1.azl3.x86_64.rpm")
70+
cleanName := extractBasePackageNameFromFile(pkg.Name)
71+
if _, err := fmt.Fprintf(writer, " \"%s\";\n", cleanName); err != nil {
72+
return fmt.Errorf("writing DOT node for %s: %w", cleanName, err)
7173
}
7274
for _, dep := range pkg.Requires {
7375
if dep == "" {
7476
continue
7577
}
76-
edgeKey := pkg.Name + "|" + dep
78+
// Extract clean dependency name for edges
79+
cleanDep := extractBasePackageNameFromFile(dep)
80+
edgeKey := cleanName + "|" + cleanDep
7781
if edgesWritten[edgeKey] {
7882
continue
7983
}
80-
if _, err := fmt.Fprintf(writer, " \"%s\" -> \"%s\";\n", pkg.Name, dep); err != nil {
81-
return fmt.Errorf("writing DOT edge %s->%s: %w", pkg.Name, dep, err)
84+
if _, err := fmt.Fprintf(writer, " \"%s\" -> \"%s\";\n", cleanName, cleanDep); err != nil {
85+
return fmt.Errorf("writing DOT edge %s->%s: %w", cleanName, cleanDep, err)
8286
}
8387
edgesWritten[edgeKey] = true
8488
}

0 commit comments

Comments
 (0)