forked from pool/coreutils
Accepting request 799984 from Base:System
- add coreutils-use-python3.patch to minimally port away from python 2.x use of pyinotify in the testsuite OBS-URL: https://build.opensuse.org/request/show/799984 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coreutils?expand=0&rev=133
This commit is contained in:
parent
f5e3a620e5
commit
cbc30d22d2
24
coreutils-use-python3.patch
Normal file
24
coreutils-use-python3.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
--- tests/du/move-dir-while-traversing.sh
|
||||||
|
+++ tests/du/move-dir-while-traversing.sh
|
||||||
|
@@ -20,9 +20,9 @@
|
||||||
|
print_ver_ du
|
||||||
|
require_trap_signame_
|
||||||
|
|
||||||
|
-# We use a python-inotify script, so...
|
||||||
|
-python -m pyinotify -h > /dev/null \
|
||||||
|
- || skip_ 'python inotify package not installed'
|
||||||
|
+# We use a python3-inotify script, so...
|
||||||
|
+python3 -m pyinotify -h > /dev/null \
|
||||||
|
+ || skip_ 'python3 inotify package not installed'
|
||||||
|
|
||||||
|
# Move a directory "up" while du is processing its sub-directories.
|
||||||
|
# While du is processing a hierarchy .../B/C/D/... this script
|
||||||
|
@@ -33,7 +33,7 @@
|
||||||
|
# rename syscall before du finishes processing the subtree under D/.
|
||||||
|
|
||||||
|
cat <<'EOF' > inotify-watch-for-dir-access.py
|
||||||
|
-#!/usr/bin/env python
|
||||||
|
+#!/usr/bin/env python3
|
||||||
|
import pyinotify as pn
|
||||||
|
import os,sys
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 4 08:05:15 UTC 2020 - Dirk Mueller <dmueller@suse.com>
|
||||||
|
|
||||||
|
- add coreutils-use-python3.patch to minimally port away from
|
||||||
|
python 2.x use of pyinotify in the testsuite
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Mar 9 07:17:46 UTC 2020 - Bernhard Voelker <mail@bernhard-voelker.de>
|
Mon Mar 9 07:17:46 UTC 2020 - Bernhard Voelker <mail@bernhard-voelker.de>
|
||||||
|
|
||||||
|
@ -54,7 +54,9 @@ BuildRequires: gcc-PIE
|
|||||||
BuildRequires: acl
|
BuildRequires: acl
|
||||||
BuildRequires: gdb
|
BuildRequires: gdb
|
||||||
BuildRequires: perl-Expect
|
BuildRequires: perl-Expect
|
||||||
BuildRequires: python-pyinotify
|
BuildRequires: python
|
||||||
|
BuildRequires: python3
|
||||||
|
BuildRequires: python3-pyinotify
|
||||||
BuildRequires: strace
|
BuildRequires: strace
|
||||||
BuildRequires: timezone
|
BuildRequires: timezone
|
||||||
# Some tests need the 'bin' user.
|
# Some tests need the 'bin' user.
|
||||||
@ -134,7 +136,8 @@ Patch301: coreutils-skip-gnulib-test-tls.patch
|
|||||||
|
|
||||||
# tests: shorten extreme-expensive factor tests
|
# tests: shorten extreme-expensive factor tests
|
||||||
Patch303: coreutils-tests-shorten-extreme-factor-tests.patch
|
Patch303: coreutils-tests-shorten-extreme-factor-tests.patch
|
||||||
|
# Stop using Python 2.x
|
||||||
|
Patch304: coreutils-use-python3.patch
|
||||||
Patch500: coreutils-disable_tests.patch
|
Patch500: coreutils-disable_tests.patch
|
||||||
Patch501: coreutils-test_without_valgrind.patch
|
Patch501: coreutils-test_without_valgrind.patch
|
||||||
|
|
||||||
@ -193,6 +196,7 @@ This package contains the documentation for the GNU Core Utilities.
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%patch303
|
%patch303
|
||||||
|
%patch304
|
||||||
%patch500
|
%patch500
|
||||||
%patch501
|
%patch501
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user