Skip to content

Commit

Permalink
Revert "setuptools --install-layout argument is no longer supported..."
Browse files Browse the repository at this point in the history
This is creating trouble during tests. Scripts are being installed to
usr/local/bin instead of usr/bin and aside from the fact that this is
tripping up the dh_usrlocal helper it is incorrect.

This reverts commit f8c8b15.
  • Loading branch information
nuclearsandwich committed Nov 14, 2024
1 parent f8c8b15 commit 9249420
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion stdeb/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -1680,7 +1680,7 @@ def build_dsc(debinfo,

RULES_OVERRIDE_INSTALL_TARGET_PY2 = " %(python2_binname)s setup.py install --force --root=debian/%(package)s --no-compile -O0 --install-layout=deb %(install_prefix)s %(no_python2_scripts_cli_args)s" # noqa: E501

RULES_OVERRIDE_INSTALL_TARGET_PY3 = " python3 setup.py install --force --root=debian/%(package3)s --no-compile -O0 %(install_prefix)s %(no_python3_scripts_cli_args)s" # noqa: E501
RULES_OVERRIDE_INSTALL_TARGET_PY3 = " python3 setup.py install --force --root=debian/%(package3)s --no-compile -O0 --install-layout=deb %(install_prefix)s %(no_python3_scripts_cli_args)s" # noqa: E501

RULES_OVERRIDE_INSTALL_TARGET = """
override_dh_auto_install:
Expand Down

0 comments on commit 9249420

Please sign in to comment.