These functions come from the deb repackaging sub-module and were altered to
allow multiple repackaging system.
Details
- Reviewers
• gabriel - Commits
- rMOZILLACENTRALb69571cb9c19: Bug 1950511 - part 2: add a common module to use with both deb and rpm r=gabriel
- Bugzilla Bug ID
- 1950511
Diff Detail
- Repository
- rMOZILLACENTRAL mozilla-central
Event Timeline
Please use these common functions in python/mozbuild/mozbuild/repackaging/deb.py to avoid duplication.
| python/mozbuild/mozbuild/repackaging/utils.py | ||
|---|---|---|
| 140 | I think what we should do here is modify repackaging.desktop_file here: https://searchfox.org/mozilla-central/source/python/mozbuild/mozbuild/repackaging/desktop_file.py#174 We can try PKG_NAME and fall-back to the DEB_PKG_NAME. pkg_name = build_variables.get("DEB_PKG_NAME", build_variables.get("PKG_NAME"))
if not pkg_name:
raise ValueError("Package name is missing. Ensure that 'PKG_NAME' is set in build variables.")We could also update the callers to pass in "PKG_NAME". I think the only other thing using these repackaging.desktop file module is the Firefox Flatpak. But this is a quick way to stop perpetuating "DEB_PKG_NAME" | |
| 212 | probably specific to .debs | |
| python/mozbuild/mozbuild/repackaging/utils.py | ||
|---|---|---|
| 140 | Never-mind updating the callers... It's in a few places: https://searchfox.org/mozilla-central/search?q=DEB_PKG_NAME&path=&case=true®exp=false Using a pkg_name variable in repackaging.desktop_file instead of looking up the hard-coded "DEB_PKG_NAME" would be an improvement. | |
| python/mozbuild/mozbuild/repackaging/utils.py | ||
|---|---|---|
| 140 | I’ve start to work on using the common module with the deb repackaging system and I’ve spot this problem too. The DEB_ prefix will be removed from the files on the repackaging module. | |
Please update the commit message to use this bug #: https://bugzilla.mozilla.org/show_bug.cgi?id=1950505
This revision requires a Testing Policy Project Tag to be set before landing. Please apply one of testing-approved, testing-exception-unchanged, testing-exception-ui, testing-exception-elsewhere, testing-exception-other. Tip: this Firefox add-on makes it easy!