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

com.ubuntu.apport.policy: fix order of entries #403

Merged
merged 1 commit into from
Nov 26, 2024

Conversation

bdrung
Copy link
Collaborator

@bdrung bdrung commented Nov 8, 2024

The /usr/share/polkit-1/actions/com.ubuntu.apport.policy PolicyKit actions file does not validate against the provided /usr/share/polkit-1/policyconfig-1.dtd:

$ xmllint --noout --nonet --dtdvalid /usr/share/polkit-1/policyconfig-1.dtd /usr/share/polkit-1/actions/com.ubuntu.apport.policy
/usr/share/polkit-1/actions/com.ubuntu.apport.policy:10: element action: validity error : Element action content does not follow the DTD, expecting (vendor? , vendor_url? , description+ , message+ , icon_name? , defaults , annotate*), got (description message annotate defaults )
/usr/share/polkit-1/actions/com.ubuntu.apport.policy:22: element action: validity error : Element action content does not follow the DTD, expecting (vendor? , vendor_url? , description+ , message+ , icon_name? , defaults , annotate*), got (description message annotate annotate defaults )
Document /usr/share/polkit-1/actions/com.ubuntu.apport.policy does not validate against /usr/share/polkit-1/policyconfig-1.dtd

Move some annotations around to make it validate.

Bug: https://launchpad.net/bugs/2084152

Copy link

codecov bot commented Nov 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 82.73%. Comparing base (0ba0e35) to head (51f6063).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #403      +/-   ##
==========================================
+ Coverage   82.72%   82.73%   +0.01%     
==========================================
  Files          98       99       +1     
  Lines       20144    20159      +15     
  Branches     3172     3173       +1     
==========================================
+ Hits        16664    16679      +15     
  Misses       2959     2959              
  Partials      521      521              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

The `/usr/share/polkit-1/actions/com.ubuntu.apport.policy` PolicyKit
actions file does not validate against the provided
`/usr/share/polkit-1/policyconfig-1.dtd`:

```
$ xmllint --noout --nonet --dtdvalid /usr/share/polkit-1/policyconfig-1.dtd /usr/share/polkit-1/actions/com.ubuntu.apport.policy
/usr/share/polkit-1/actions/com.ubuntu.apport.policy:10: element action: validity error : Element action content does not follow the DTD, expecting (vendor? , vendor_url? , description+ , message+ , icon_name? , defaults , annotate*), got (description message annotate defaults )
/usr/share/polkit-1/actions/com.ubuntu.apport.policy:22: element action: validity error : Element action content does not follow the DTD, expecting (vendor? , vendor_url? , description+ , message+ , icon_name? , defaults , annotate*), got (description message annotate annotate defaults )
Document /usr/share/polkit-1/actions/com.ubuntu.apport.policy does not validate against /usr/share/polkit-1/policyconfig-1.dtd
```

Move some annotations around to make it validate.

Let the CI depend on libxml2-utils for the xmllint binary and on polkitd
for providing `/usr/share/polkit-1/policyconfig-1.dtd`.

Bug: https://launchpad.net/bugs/2084152
@schopin-pro schopin-pro merged commit 2da9151 into canonical:main Nov 26, 2024
16 checks passed
@bdrung bdrung deleted the fix-2084152 branch November 27, 2024 12:19
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.

2 participants