almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Handle complaints about shebangs during RPM build

Browse source 
When building the Dangerzone RPMs, we were seeing the following shebang
warnings:

    + /usr/lib/rpm/redhat/brp-mangle-shebangs
    mangling shebang in /usr/lib/python3.12/site-packages/dangerzone/conversion/doc_to_pixels.py from /usr/bin/env python3 to #!/usr/bin/python3
    mangling shebang in /usr/lib/python3.12/site-packages/dangerzone/conversion/common.py from /usr/bin/env python3 to #!/usr/bin/python3
    mangling shebang in /usr/lib/python3.12/site-packages/dangerzone/conversion/pixels_to_pdf.py from /usr/bin/env python3 to #!/usr/bin/python3
    mangling shebang in /etc/qubes-rpc/dz.ConvertDev from /usr/bin/env python3 to #!/usr/bin/python3
    mangling shebang in /etc/qubes-rpc/dz.Convert from /bin/sh to #!/usr/bin/sh

These warnings are benign in nature, but coupled with #727, they could
lead to incorrect file permissions.

Remove shebangs from the following files, since they are not executed
directly, but are imported instead:

    dangerzone/conversion/common.py
    dangerzone/conversion/doc_to_pixels.py
    dangerzone/conversion/pixels_to_pdf.py

Also, accept the suggestions by Fedora (/bin/sh -> /usr/bin/sh,
/usr/bin/env python3 -> /usr/bin/python3) for the following files:

    qubes/dz.Convert
    qubes/dz.ConvertDev

Refs #727
This commit is contained in:
Alex Pyrgiotis 2024-05-27 19:34:32 +03:00
parent 797b28e191
commit 1e1d9274f0
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
5 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dangerzone/conversion/common.py
View file

@ -1,5 +1,3 @@
#!/usr/bin/env python3
import asyncio import asyncio
import glob import glob
import json import json

1
dangerzone/conversion/doc_to_pixels.py
View file

@ -1,4 +1,3 @@
#!/usr/bin/env python3
import asyncio import asyncio
import glob import glob
import os import os

1
dangerzone/conversion/pixels_to_pdf.py
View file

@ -1,4 +1,3 @@
#!/usr/bin/env python3
""" """
Here are the steps, with progress bar percentages: Here are the steps, with progress bar percentages:

2
qubes/dz.Convert
View file

@ -1,2 +1,2 @@
#!/bin/sh #!/usr/bin/sh
python -m dangerzone.conversion.doc_to_pixels python -m dangerzone.conversion.doc_to_pixels

2
qubes/dz.ConvertDev
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3 #!/usr/bin/python3
import asyncio import asyncio
import glob import glob