PR#49896: Ticket 49891 - Use "--python3" macro for python scripts - 389-ds-base

389-ds-base

#49896 Ticket 49891 - Use "--python3" macro for python scripts

Closed 3 years ago by spichugi. Opened 5 years ago by mreynolds.

mreynolds/389-ds-base ticket49891 into master

Ticket 49891 - Use "--python3" macro for python scripts

Mark Reynolds • 5 years ago

b413ba0

ldap/admin/src/scripts/ds-logpipe.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- #!/usr/bin/env python`
		`+ #!/usr/bin/python3`

		`from __future__ import print_function`

ldap/admin/src/scripts/ds-replcheck

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- #!/usr/bin/python`
		`+ #!/usr/bin/python3`

		`# --- BEGIN COPYRIGHT BLOCK ---`
		`# Copyright (C) 2018 Red Hat, Inc.`

rpm/389-ds-base.spec.in

file modified

		`@@ -329,6 +329,9 @@`

		`cp %{SOURCE2} README.devel`

		`+ # Make sure python3 is used in shebangs`
		`+ sed -r -i '1s\|^#!\s/usr/bin.python.\|#!%{__python3}\|' ldap/admin/src/scripts/{.py,ds-replcheck,readnsstate}`
vashirov commented 5 years ago Is it needed for ds-replcheck if you change shebang to python3 explicitly? And the only other .py files are: $ ls -1 ldap/admin/src/scripts/.py ldap/admin/src/scripts/ds-logpipe.py ldap/admin/src/scripts/failedbinds.py ldap/admin/src/scripts/logregex.py ldap/admin/src/scripts/ns-slapd-gdb.py
mreynolds commented 5 years ago Not needed, just added it for consistency
		`+`
		`%build`

		`%if %{use_clang}`

mreynolds commented 5 years ago

Description: Make sure all python scripts use the macro "__python3"
for its shebang.

https://pagure.io/389-ds-base/issue/49891

Reviewed by: ?

vashirov commented 5 years ago

There are also python scripts that don't have shebang at all:

./ldap/admin/src/scripts/logregex.py
./ldap/admin/src/scripts/failedbinds.py

vashirov commented on line 6 of rpm/389-ds-base.spec.in 5 years ago

Is it needed for ds-replcheck if you change shebang to python3 explicitly? And the only other *.py files are:

$ ls -1 ldap/admin/src/scripts/*.py
ldap/admin/src/scripts/ds-logpipe.py
ldap/admin/src/scripts/failedbinds.py
ldap/admin/src/scripts/logregex.py
ldap/admin/src/scripts/ns-slapd-gdb.py

mreynolds commented 5 years ago

There are also python scripts that don't have shebang at all:
./ldap/admin/src/scripts/logregex.py
./ldap/admin/src/scripts/failedbinds.py

Right so there is nothing to do :-p

mreynolds commented on line 6 of rpm/389-ds-base.spec.in 5 years ago

Not needed, just added it for consistency

vashirov commented 5 years ago

I'm trying to understand this change. Please correct me if I'm wrong. So you're changing shebang in python scripts to python3 and then replace it in spec file with %{__python3} macro. Is this needed for platform-python?

mreynolds commented 5 years ago

Sorry Viktor, we actually don't have to do anything. After I opened the ticket I got in touch with the group that originally identified us having to make a change, but turns out we don't. Since I had the ticket open I thought I'd do a little cleanup, but none of this is necessary.

mreynolds commented 5 years ago

Actually the downstream spec file already had this change, I was just adding it to the upstream specfile

vashirov commented 5 years ago

I think this change is needed. For example tests for conflict resolution are failing in nightlies, because ds-replcheck uses python2, but lib389 is for python3 only. So at least we can make things the same in upstream spec file and in downstream (Fedora and RHEL).

mreynolds commented 5 years ago

I think this change is needed. For example tests for conflict resolution are failing in nightlies, because ds-replcheck uses python2, but lib389 is for python3 only. So at least we can make things the same in upstream spec file and in downstream (Fedora and RHEL).

So it that an ack? :-)

vashirov commented 5 years ago

Sorry, yes, it's an ack :)

rebased onto b413ba0

5 years ago

Pull-Request has been merged by mreynolds

5 years ago