Skip to content

fix: correct extend-diff-ignore regex for dpkg-source#116

Merged
rtibbles merged 1 commit intomainfrom
fix/dpkg-source-diff-ignore
Mar 4, 2026
Merged

fix: correct extend-diff-ignore regex for dpkg-source#116
rtibbles merged 1 commit intomainfrom
fix/dpkg-source-diff-ignore

Conversation

@rtibbles
Copy link
Member

@rtibbles rtibbles commented Mar 4, 2026

Summary

  • Fix extend-diff-ignore regex in debian/source/options so dpkg-source correctly ignores files excluded from the orig tarball via .tarignore (.github/, test/, .gitignore, .tarignore, IDE files)
  • Add .venv, *.egg-info, and __pycache__ to .tarignore to prevent local dev artifacts from leaking into the orig tarball

Context

After merging #114 and #115, build_debian.yml was failing because dpkg-source detected "unexpected upstream changes" — files present in the working tree but excluded from the orig tarball by .tarignore. The previous regex ^[^/]*/(...)/? was wrong; file paths don't have a directory prefix.

Test plan

  • Verified locally: dpkg-buildpackage -S -us -uc succeeds in a clean ubuntu:latest container
  • CI build_debian.yml passes on next release

🤖 Generated with Claude Code

.tarignore excludes .github, .tarignore, test, etc. from the orig
tarball, but dpkg-source (3.0 quilt) then sees those files in the
working tree as unexpected upstream changes. Add extend-diff-ignore
to debian/source/options to match the .tarignore exclusions.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@rtibbles rtibbles merged commit 42457c9 into main Mar 4, 2026
14 checks passed
@rtibbles rtibbles deleted the fix/dpkg-source-diff-ignore branch March 4, 2026 05:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant