Dirk Mueller
680daa4eb0
* Flake8 / Stop leaking filedescriptors
- Update rpmlint-tests:
* Stop leaking filedescriptors
* Address various deprecation warnings
* Avoid leaking fds and further Python 3.x porting
- drop sourced-dirs.diff, fix-shared-library-matching.diff,
suse-python-abi-check.diff, add-check-for-tmpfiles-created-at-r.diff: obsolete
ignore-readelf-ar-error.diff, remove-ghostfile-checks.diff
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=499
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
Index: rpmlint-rpmlint-1.10/test.sh
|
|
===================================================================
|
|
--- rpmlint-rpmlint-1.10.orig/test.sh
|
|
+++ rpmlint-rpmlint-1.10/test.sh
|
|
@@ -19,7 +19,10 @@ for i in $TESTPATH/test.*.py; do
|
|
fi
|
|
done
|
|
|
|
-run_rpmlint="$PYTHON ./rpmlint -C $(pwd)"
|
|
+export RPMLINT_SKIP_GLOBAL=1
|
|
+
|
|
+run_rpmlint="$PYTHON ./rpmlint -f config -C $(pwd)"
|
|
+
|
|
|
|
echo "Check that rpmlint executes with no unexpected errors"
|
|
echo "...in default locale"
|
|
@@ -40,10 +46,6 @@ $PYTEST -v || exit $?
|
|
|
|
unset PYTHONWARNINGS
|
|
|
|
-echo "$FLAKE8 tests"
|
|
-$FLAKE8 --version
|
|
-$FLAKE8 . ./rpmdiff ./rpmlint || exit $?
|
|
-
|
|
echo "man page tests"
|
|
if man --help 2>&1 | grep -q -- --warnings; then
|
|
tmpfile=$(mktemp) || exit 1
|
|
Index: rpmlint-rpmlint-1.10/rpmlint
|
|
===================================================================
|
|
--- rpmlint-rpmlint-1.10.orig/rpmlint
|
|
+++ rpmlint-rpmlint-1.10/rpmlint
|
|
@@ -269,8 +269,10 @@ if not os.path.exists(os.path.expanduser
|
|
info_error = set()
|
|
|
|
# load global config files
|
|
-configs = glob.glob('/etc/rpmlint/*config')
|
|
-configs.sort()
|
|
+configs = []
|
|
+if 'RPMLINT_SKIP_GLOBAL' not in os.environ:
|
|
+ configs = glob.glob('/etc/rpmlint/*config')
|
|
+ configs.sort()
|
|
|
|
# Was rpmlint invoked as a prefixed variant?
|
|
m = re.match(r"(?P<prefix>[\w-]+)-rpmlint(\.py)?", argv0)
|