Skip to content

Conversation

@peat-psuwit
Copy link
Contributor

Requirements

All new code should be covered with tests, documentation should be updated. CI should pass.

Description of the Change

dpkg-gencontrol can be called with -v flag which set binary package's
version separated from source version. When this happen, the Source
field will contain version number in addition to source package name.
This tripped Aptly's dbgsym restriction, which check for exact source
package name, which in turn prevents the dbgsym & the whole .changes
file from being imported.

From the git history, it seems like this condition is a leftover from
when Aptly filter dbgsym packages using "*-dbgsym". So, I decided to
remove it. A test case has been added to prevent regression.

Checklist

  • unit-test added (if change is algorithm)
  • functional test added/updated (if change is functional)
  • man page updated (if applicable)
  • bash completion updated (if applicable)
  • documentation updated
  • author name in AUTHORS

@peat-psuwit
Copy link
Contributor Author

There seem to be some PGP failures due to key expiration/revocation.

@peat-psuwit peat-psuwit force-pushed the remove-dbgsym-source-match branch from 2d86b66 to 021f220 Compare March 12, 2021 10:08
@codecov
Copy link

codecov bot commented Mar 12, 2021

Codecov Report

Merging #936 (021f220) into master (f9d08e1) will decrease coverage by 0.01%.
The diff coverage is n/a.

❗ Current head 021f220 differs from pull request most recent head 69c94ce. Consider uploading reports for the commit 69c94ce to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##           master     #936      +/-   ##
==========================================
- Coverage   61.28%   61.26%   -0.02%     
==========================================
  Files          54       54              
  Lines        5928     5925       -3     
==========================================
- Hits         3633     3630       -3     
  Misses       1770     1770              
  Partials      525      525              
Impacted Files Coverage Δ
deb/changes.go 57.35% <ø> (-0.62%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f9d08e1...69c94ce. Read the comment docs.

@peat-psuwit
Copy link
Contributor Author

The commit is rebased. PTAL.

@mariogrip
Copy link

ping @lbolla

Copy link

@mariogrip mariogrip left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@lbolla
Copy link
Contributor

lbolla commented Jun 10, 2021

@peat-psuwit if you rebase this against master I can then merge.

@peat-psuwit peat-psuwit force-pushed the remove-dbgsym-source-match branch from 021f220 to 69c94ce Compare June 10, 2021 16:35
@peat-psuwit
Copy link
Contributor Author

Please take another look. The test failure seems to be external.

@peat-psuwit peat-psuwit force-pushed the remove-dbgsym-source-match branch from 69c94ce to 0ac0c4f Compare August 18, 2021 18:12
@peat-psuwit peat-psuwit force-pushed the remove-dbgsym-source-match branch from 0ac0c4f to 23a66b7 Compare October 5, 2021 16:31
@peat-psuwit peat-psuwit force-pushed the remove-dbgsym-source-match branch from 23a66b7 to 11d33ba Compare November 25, 2021 15:47
@peat-psuwit
Copy link
Contributor Author

@lbolla please take another look.

@lbolla
Copy link
Contributor

lbolla commented Dec 16, 2021

@neolynx What do you think of this patch? I am not too familiar with this part: I'd appreciate your input before merging.

Copy link
Contributor

@lbolla lbolla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@peat-psuwit Would you mind rebasing this once more? master now has fully functional unittests run on GH Actions, whose successful run is required for each PR. Thanks!

@neolynx
Copy link
Member

neolynx commented Jan 29, 2022

LGTM ! please rebase, if tests are green, we can merge it

@peat-psuwit peat-psuwit force-pushed the remove-dbgsym-source-match branch from 11d33ba to 03702dd Compare January 29, 2022 12:09
dpkg-gencontrol can be called with -v flag which set binary package's
version separated from source version. When this happen, the Source
field will contain version number in addition to source package name.
This tripped Aptly's dbgsym restriction, which check for exact source
package name, which in turn prevents the dbgsym & the whole .changes
file from being imported.

From the git history, it seems like this condition is a leftover from
when Aptly filter dbgsym packages using "*-dbgsym". So, I decided to
remove it. A test case has been added to prevent regression.
@peat-psuwit peat-psuwit force-pushed the remove-dbgsym-source-match branch from 03702dd to efbd387 Compare January 29, 2022 12:16
@peat-psuwit
Copy link
Contributor Author

Rebased and adapt to a change in test utils. Please have another look.

Copy link
Contributor

@randombenj randombenj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@lbolla lbolla merged commit 814d4db into aptly-dev:master Jan 31, 2022
@randombenj randombenj added this to the 1.5.0 milestone Jun 23, 2022
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.

5 participants