scripts/pythondistdeps: Rework error messages
This commit is contained in:
parent
b6e0638f7c
commit
098c48d46d
@ -47,7 +47,7 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} *.py
|
|||||||
%{_rpmconfigdir}/pythonbundles.py
|
%{_rpmconfigdir}/pythonbundles.py
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Jun 17 2020 Tomas Orsava <torsava@redhat.com> - 11-9
|
* Fri Jul 10 2020 Tomas Orsava <torsava@redhat.com> - 11-9
|
||||||
- pythondistdeps: Implement provides/requires for extras packages
|
- pythondistdeps: Implement provides/requires for extras packages
|
||||||
- Enable --require-extras-subpackages
|
- Enable --require-extras-subpackages
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
import argparse
|
import argparse
|
||||||
from os.path import basename, dirname, isdir, sep
|
from os.path import basename, dirname, isdir, sep
|
||||||
from sys import argv, stdin, version
|
from sys import argv, stdin, stderr, version
|
||||||
from distutils.sysconfig import get_python_lib
|
from distutils.sysconfig import get_python_lib
|
||||||
from warnings import warn
|
from warnings import warn
|
||||||
|
|
||||||
@ -65,11 +65,13 @@ class RpmVersion():
|
|||||||
|
|
||||||
def convert_compatible(name, operator, version_id):
|
def convert_compatible(name, operator, version_id):
|
||||||
if version_id.endswith('.*'):
|
if version_id.endswith('.*'):
|
||||||
print('Invalid requirement: {} {} {}'.format(name, operator, version_id))
|
print("*** INVALID_REQUIREMENT_ERROR___SEE_STDERR ***")
|
||||||
|
print('Invalid requirement: {} {} {}'.format(name, operator, version_id), file=stderr)
|
||||||
exit(65) # os.EX_DATAERR
|
exit(65) # os.EX_DATAERR
|
||||||
version = RpmVersion(version_id)
|
version = RpmVersion(version_id)
|
||||||
if len(version.version) == 1:
|
if len(version.version) == 1:
|
||||||
print('Invalid requirement: {} {} {}'.format(name, operator, version_id))
|
print("*** INVALID_REQUIREMENT_ERROR___SEE_STDERR ***")
|
||||||
|
print('Invalid requirement: {} {} {}'.format(name, operator, version_id), file=stderr)
|
||||||
exit(65) # os.EX_DATAERR
|
exit(65) # os.EX_DATAERR
|
||||||
upper_version = RpmVersion(version_id)
|
upper_version = RpmVersion(version_id)
|
||||||
upper_version.version.pop()
|
upper_version.version.pop()
|
||||||
@ -88,7 +90,8 @@ def convert_equal(name, operator, version_id):
|
|||||||
|
|
||||||
def convert_arbitrary_equal(name, operator, version_id):
|
def convert_arbitrary_equal(name, operator, version_id):
|
||||||
if version_id.endswith('.*'):
|
if version_id.endswith('.*'):
|
||||||
print('Invalid requirement: {} {} {}'.format(name, operator, version_id))
|
print("*** INVALID_REQUIREMENT_ERROR___SEE_STDERR ***")
|
||||||
|
print('Invalid requirement: {} {} {}'.format(name, operator, version_id), file=stderr)
|
||||||
exit(65) # os.EX_DATAERR
|
exit(65) # os.EX_DATAERR
|
||||||
version = RpmVersion(version_id)
|
version = RpmVersion(version_id)
|
||||||
return '{} = {}'.format(name, version)
|
return '{} = {}'.format(name, version)
|
||||||
@ -278,8 +281,9 @@ if __name__ == "__main__":
|
|||||||
|
|
||||||
# If we're processing an extras subpackage, check that the extras exists
|
# If we're processing an extras subpackage, check that the extras exists
|
||||||
if extras_subpackage and extras_subpackage not in dist.extras:
|
if extras_subpackage and extras_subpackage not in dist.extras:
|
||||||
|
print("*** PYTHON_EXTRAS_NOT_FOUND_ERROR___SEE_STDERR ***")
|
||||||
print(f"\nError: The package name contains an extras name `{extras_subpackage}` that was not found in the metadata.\n"
|
print(f"\nError: The package name contains an extras name `{extras_subpackage}` that was not found in the metadata.\n"
|
||||||
"Check if the extras were removed from the project. If so, consider removing the subpackage and obsoleting it from another.")
|
"Check if the extras were removed from the project. If so, consider removing the subpackage and obsoleting it from another.\n", file=stderr)
|
||||||
exit(65) # os.EX_DATAERR
|
exit(65) # os.EX_DATAERR
|
||||||
|
|
||||||
if args.majorver_provides or args.majorver_provides_versions or \
|
if args.majorver_provides or args.majorver_provides_versions or \
|
||||||
|
Loading…
Reference in New Issue
Block a user