Skip to content
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.

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

manifest related cleanups #21513

Merged
merged 3 commits into from
Jan 13, 2025
Merged

Conversation

martinpitt
Copy link
Member

Fixes #20984

The file was renamed in commit f459553.
The Python bridge has never served that.

Fixes cockpit-project#20984
The Python bridge has never implemented them. These now just cause a lot
of 404 error message noise when starting a Cockpit session.
@martinpitt martinpitt marked this pull request as ready for review January 13, 2025 10:22
@martinpitt martinpitt requested a review from jelly January 13, 2025 10:22
@@ -8,9 +8,6 @@
<link href="../../static/branding.css" rel="stylesheet" />
<script src="../base1/cockpit.js"></script>
<script src="../manifests.js"></script>
<!-- HACK: C bridge loads translations via glob and Python via manifest.js -->
<script src="../*/po.manifest.js"></script>
<script src="../*/po.js"></script>
Copy link
Member

Choose a reason for hiding this comment

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

As we beiboot in cockpit client and other situations I suppose there is no way an old bridge server new shell code. So this seems fine.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, that was my thought as well. The debs and rpm ensure that cockpit-{bridge,system} have the same version, and Arch doesn't even split the package.

Copy link
Member

@jelly jelly left a comment

Choose a reason for hiding this comment

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

Thanks!

@martinpitt martinpitt merged commit b360329 into cockpit-project:main Jan 13, 2025
85 checks passed
@martinpitt martinpitt deleted the manifest branch January 13, 2025 11:54
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.

No longer able to fetch manifest.json
2 participants