Skip to content

distrogen: Fix --compare feature #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
braydonk wants to merge 2 commits into
base: master
Choose a base branch
from
Open

distrogen: Fix --compare feature #487

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
554433d
distrogen: Fix `--compare` feature
braydonk Jan 26, 2026
cd5eb95
Merge branch 'master' into fix_compare
jefferbrecht Jan 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions cmd/distrogen/distribution.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,16 +327,16 @@ func (d *DistributionGenerator) Compare() error {
)
}

logger.Debug("comparing %s to %s", d.GeneratePath, generateDest)
logger.Debug("comparing ", d.GeneratePath, generateDest)

generatedContent, err := d.getGeneratedFilesInDir()
generatedContent, err := d.getGeneratedFilesInDir(d.GeneratePath)
if err != nil {
return wrapExitCodeError(
unexpectErrExitCode,
fmt.Errorf("could not get generated files: %w", err),
)
}
existingContent, err := d.getGeneratedFilesInDir()
existingContent, err := d.getGeneratedFilesInDir(generateDest)
if err != nil {
return wrapExitCodeError(
unexpectErrExitCode,
Expand Down Expand Up @@ -372,15 +372,10 @@ func (d *DistributionGenerator) Compare() error {
return nil
}

func (dg *DistributionGenerator) getGeneratedFilesInDir() (map[string]*generatedFile, error) {
wd, err := os.Getwd()
if err != nil {
return nil, fmt.Errorf("could not get working directory: %w", err)
}
dir := filepath.Join(wd, dg.GenerateDirName)
func (dg *DistributionGenerator) getGeneratedFilesInDir(dir string) (map[string]*generatedFile, error) {
files := map[string]*generatedFile{}

err = filepath.WalkDir(dir, func(path string, d fs.DirEntry, err error) error {
err := filepath.WalkDir(dir, func(path string, d fs.DirEntry, err error) error {
if err != nil {
return err
}
Expand Down
Loading