Mock Version: 2.8 Mock Version: 2.8 Mock Version: 2.8 ENTER ['do_with_status'](['bash', '--login', '-c', '/usr/bin/rpmbuild -bs --target noarch --nodeps /builddir/build/SPECS/sos.spec'], chrootPath='/var/lib/mock/dist-an8-build-71386-37360/root'env={'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOME': '/builddir', 'HOSTNAME': 'mock', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin', 'PROMPT_COMMAND': 'printf "\\033]0;\\007"', 'PS1': ' \\s-\\v\\$ ', 'LANG': 'C.UTF-8'}shell=Falselogger=timeout=86400uid=989gid=135user='mockbuild'nspawn_args=[]unshare_net=TrueprintOutput=False) Executing command: ['bash', '--login', '-c', '/usr/bin/rpmbuild -bs --target noarch --nodeps /builddir/build/SPECS/sos.spec'] with env {'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOME': '/builddir', 'HOSTNAME': 'mock', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin', 'PROMPT_COMMAND': 'printf "\\033]0;\\007"', 'PS1': ' \\s-\\v\\$ ', 'LANG': 'C.UTF-8'} and shell False Building target platforms: noarch Building for target noarch Wrote: /builddir/build/SRPMS/sos-4.1-5.0.1.an8.src.rpm Child return code was: 0 ENTER ['do_with_status'](['bash', '--login', '-c', '/usr/bin/rpmbuild -bb --target noarch --nodeps /builddir/build/SPECS/sos.spec'], chrootPath='/var/lib/mock/dist-an8-build-71386-37360/root'env={'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOME': '/builddir', 'HOSTNAME': 'mock', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin', 'PROMPT_COMMAND': 'printf "\\033]0;\\007"', 'PS1': ' \\s-\\v\\$ ', 'LANG': 'C.UTF-8'}shell=Falselogger=timeout=86400uid=989gid=135user='mockbuild'nspawn_args=[]unshare_net=TrueprintOutput=False) Executing command: ['bash', '--login', '-c', '/usr/bin/rpmbuild -bb --target noarch --nodeps /builddir/build/SPECS/sos.spec'] with env {'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOME': '/builddir', 'HOSTNAME': 'mock', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin', 'PROMPT_COMMAND': 'printf "\\033]0;\\007"', 'PS1': ' \\s-\\v\\$ ', 'LANG': 'C.UTF-8'} and shell False Building target platforms: noarch Building for target noarch Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.JZmaGM + umask 022 + cd /builddir/build/BUILD + cd /builddir/build/BUILD + rm -rf sos-4.1 + /usr/bin/gzip -dc /builddir/build/SOURCES/sos-4.1.tar.gz + /usr/bin/tar -xof - + STATUS=0 + '[' 0 -ne 0 ']' + cd sos-4.1 + /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w . + cd /builddir/build/BUILD + cd sos-4.1 + /usr/bin/gzip -dc /builddir/build/SOURCES/sos-audit-0.3.tgz + /usr/bin/tar -xof - + STATUS=0 + '[' 0 -ne 0 ']' + /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w . + echo 'Patch #1 (sos-bz1930181-collect-cleaning-consistency.patch):' Patch #1 (sos-bz1930181-collect-cleaning-consistency.patch): + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sos/cleaner/__init__.py patching file sos/cleaner/parsers/username_parser.py Hunk #1 succeeded at 38 (offset -1 lines). patching file sos/cleaner/__init__.py patching file sos/cleaner/obfuscation_archive.py Hunk #1 succeeded at 229 (offset 10 lines). + echo 'Patch #2 (sos-bz1935603-manpages-see-also.patch):' Patch #2 (sos-bz1935603-manpages-see-also.patch): + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file man/en/sos-clean.1 patching file man/en/sos-collect.1 patching file man/en/sos-report.1 + echo 'Patch #3 (sos-bz1937418-add-cmd-timeout.patch):' Patch #3 (sos-bz1937418-add-cmd-timeout.patch): + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file man/en/sos-report.1 patching file sos/collector/__init__.py patching file sos/collector/sosnode.py patching file sos/options.py patching file sos/report/__init__.py patching file sos/report/plugins/__init__.py + echo 'Patch #4 (sos-bz1937298-ds-mask-password-in-ldif.patch):' Patch #4 (sos-bz1937298-ds-mask-password-in-ldif.patch): + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sos/report/plugins/ds.py + echo 'Patch #5 (sos-bz1939963-gather-cups-browsed-logs.patch):' Patch #5 (sos-bz1939963-gather-cups-browsed-logs.patch): + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sos/report/plugins/cups.py + echo 'Patch #6 (sos-bz1940502-sssd-memcache-and-logs.patch):' Patch #6 (sos-bz1940502-sssd-memcache-and-logs.patch): + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sos/report/plugins/sssd.py + echo 'Patch #7 (sos-bz1942276-ibmvNIC-dynamic-debugs.patch):' Patch #7 (sos-bz1942276-ibmvNIC-dynamic-debugs.patch): + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sos/report/plugins/kernel.py + echo 'Patch #8 (sos-bz1956673-pulpcore-plugin.patch):' Patch #8 (sos-bz1956673-pulpcore-plugin.patch): + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sos/report/plugins/pulpcore.py Patch #9 (sos-bz1959413-saphana-traceback.patch): + echo 'Patch #9 (sos-bz1959413-saphana-traceback.patch):' + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sos/report/plugins/saphana.py Patch #10 (sos-bz1961458-collect-nstat.patch): + echo 'Patch #10 (sos-bz1961458-collect-nstat.patch):' + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sos/report/plugins/networking.py Hunk #2 succeeded at 192 (offset -7 lines). Patch #11 (sos-bz1961229-snapper-plugin-and-allocation-failures.patch): + echo 'Patch #11 (sos-bz1961229-snapper-plugin-and-allocation-failures.patch):' + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sos/report/plugins/block.py patching file sos/report/plugins/snapper.py patching file sos/report/plugins/kernel.py Patch #12 (sos-bz1925419-all-gluster-files.patch): + echo 'Patch #12 (sos-bz1925419-all-gluster-files.patch):' + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sos/report/plugins/gluster.py Patch #13 (sos-bz1964499-obfuscate-fqdn-from-dnf-log.patch): + echo 'Patch #13 (sos-bz1964499-obfuscate-fqdn-from-dnf-log.patch):' + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sos/cleaner/obfuscation_archive.py patching file sos/cleaner/parsers/ip_parser.py Patch #14 (sos-bz1886711-enhance-tc-hw-offload.patch): + echo 'Patch #14 (sos-bz1886711-enhance-tc-hw-offload.patch):' + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sos/report/plugins/networking.py Hunk #1 succeeded at 149 (offset -7 lines). Patch #15 (sos-bz1965001-fix-avc-copystating-proc-sys.patch): + echo 'Patch #15 (sos-bz1965001-fix-avc-copystating-proc-sys.patch):' + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sos/archive.py Hunk #1 succeeded at 325 (offset -1 lines). Hunk #2 succeeded at 361 (offset -1 lines). Hunk #3 succeeded at 390 (offset -1 lines). patching file tests/vendor_tests/redhat/rhbz1965001.py Patch #16 (sos-bz1967613-sssd-common.patch): + echo 'Patch #16 (sos-bz1967613-sssd-common.patch):' + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sos/report/plugins/sssd.py Patch #17 (sos-bz1973675-ocp-cluster-cleaner.patch): + echo 'Patch #17 (sos-bz1973675-ocp-cluster-cleaner.patch):' + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sos/cleaner/parsers/__init__.py patching file man/en/sos-collect.1 Hunk #1 succeeded at 25 (offset -1 lines). Hunk #2 succeeded at 237 (offset -13 lines). patching file sos/collector/__init__.py Hunk #3 succeeded at 320 (offset -3 lines). patching file sos/collector/sosnode.py Hunk #3 succeeded at 374 (offset -1 lines). patching file sos/policies/distros/__init__.py Hunk #2 succeeded at 493 (offset -134 lines). patching file sos/policies/distros/redhat.py Hunk #1 succeeded at 414 (offset -38 lines). Hunk #2 succeeded at 448 (offset -38 lines). Hunk #3 succeeded at 478 (offset -38 lines). patching file sos/policies/runtimes/__init__.py patching file sos/collector/clusters/__init__.py patching file sos/collector/sosnode.py Hunk #1 succeeded at 646 (offset -1 lines). Hunk #2 succeeded at 710 (offset -1 lines). patching file sos/collector/sosnode.py patching file sos/collector/sosnode.py Hunk #3 succeeded at 964 (offset -32 lines). patching file sos/collector/clusters/kubernetes.py patching file sos/collector/clusters/ocp.py patching file sos/cleaner/__init__.py patching file man/en/sos-clean.1 patching file sos/cleaner/__init__.py patching file sos/cleaner/obfuscation_archive.py patching file sos/collector/__init__.py Hunk #2 succeeded at 392 (offset -19 lines). patching file sos/report/__init__.py Hunk #2 succeeded at 333 (offset -12 lines). patching file sos/collector/clusters/__init__.py patching file sos/collector/sosnode.py Hunk #1 succeeded at 656 (offset -1 lines). Hunk #2 succeeded at 714 (offset -1 lines). patching file sos/collector/sosnode.py Hunk #3 succeeded at 420 (offset -1 lines). Hunk #4 succeeded at 462 (offset -1 lines). Hunk #5 succeeded at 849 (offset -1 lines). patching file sos/collector/__init__.py Hunk #1 succeeded at 1152 (offset -34 lines). Hunk #2 succeeded at 1187 (offset -34 lines). patching file sos/collector/clusters/__init__.py patching file sos/collector/sosnode.py Hunk #2 succeeded at 465 (offset -1 lines). Hunk #3 succeeded at 484 (offset -1 lines). Hunk #4 succeeded at 653 (offset -1 lines). Hunk #5 succeeded at 752 (offset -1 lines). patching file sos/cleaner/__init__.py Hunk #1 succeeded at 616 (offset 4 lines). patching file sos/cleaner/parsers/__init__.py patching file sos/cleaner/parsers/keyword_parser.py Hunk #1 succeeded at 36 (offset -6 lines). patching file sos/cleaner/parsers/username_parser.py Hunk #1 succeeded at 50 (offset -1 lines). patching file sos/cleaner/__init__.py Hunk #2 succeeded at 672 (offset 4 lines). patching file sos/cleaner/mappings/__init__.py patching file sos/cleaner/mappings/hostname_map.py patching file sos/cleaner/obfuscation_archive.py Hunk #1 succeeded at 200 (offset -2 lines). Hunk #2 succeeded at 240 (offset -2 lines). Hunk #3 succeeded at 277 (offset -2 lines). patching file sos/cleaner/parsers/__init__.py patching file sos/cleaner/mappings/hostname_map.py patching file sos/cleaner/parsers/__init__.py patching file sos/cleaner/parsers/hostname_parser.py patching file sos/collector/clusters/ocp.py patching file sos/collector/sosnode.py patching file sos/cleaner/parsers/username_parser.py patching file sos/cleaner/__init__.py patching file sos/cleaner/obfuscation_archive.py Hunk #1 succeeded at 60 (offset 2 lines). Patch #18 (sos-bz1923938-sos-log-effective-options.patch): + echo 'Patch #18 (sos-bz1923938-sos-log-effective-options.patch):' + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sos/collector/sosnode.py Hunk #1 succeeded at 733 (offset -1 lines). patching file sos/collector/__init__.py Hunk #1 succeeded at 268 (offset -4 lines). patching file sos/options.py patching file sos/cleaner/__init__.py Hunk #1 succeeded at 182 (offset -10 lines). patching file sos/collector/__init__.py Hunk #1 succeeded at 408 (offset -19 lines). patching file sos/report/__init__.py Hunk #1 succeeded at 329 (offset -12 lines). patching file sos/collector/__init__.py Hunk #1 succeeded at 82 (offset -2 lines). Hunk #2 succeeded at 268 (offset -5 lines). patching file sos/collector/sosnode.py Hunk #1 succeeded at 666 (offset -1 lines). Hunk #2 succeeded at 687 (offset -1 lines). Hunk #3 succeeded at 753 (offset -1 lines). Hunk #4 succeeded at 805 (offset -1 lines). Patch #19 (sos-bz1985986-potential-issues-static-analyse.patch): + echo 'Patch #19 (sos-bz1985986-potential-issues-static-analyse.patch):' + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sos/report/plugins/yum.py Hunk #1 succeeded at 84 (offset -7 lines). patching file sos/report/plugins/__init__.py Patch #20 (sos-bz1959598-conversions-and-upgrades.patch): + echo 'Patch #20 (sos-bz1959598-conversions-and-upgrades.patch):' + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sos/report/plugins/migration_results.py Patch #21 (sos-bz1665947-rhui-plugin.patch): + echo 'Patch #21 (sos-bz1665947-rhui-plugin.patch):' + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sos/report/plugins/pulpcore.py patching file sos/report/plugins/rhui.py patching file sos/report/plugins/__init__.py Hunk #1 succeeded at 1191 (offset 4 lines). Hunk #2 succeeded at 1208 (offset 4 lines). patching file sos/report/plugins/pulpcore.py patching file sos/report/plugins/rhui.py patching file sos/report/plugins/ansible.py patching file sos/report/plugins/rhui.py patching file sos/report/plugins/rhui.py Patch #22 (sos-bz1985037-cleaner-AD-users-obfuscation.patch): + echo 'Patch #22 (sos-bz1985037-cleaner-AD-users-obfuscation.patch):' + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sos/cleaner/__init__.py Hunk #1 succeeded at 506 (offset -12 lines). patching file sos/cleaner/parsers/__init__.py patching file sos/cleaner/parsers/username_parser.py Hunk #2 succeeded at 54 (offset -1 lines). Patch #100 (0001-sos-anolis-modify-strings.patch): + echo 'Patch #100 (0001-sos-anolis-modify-strings.patch):' + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 can't find file to patch at input line 15 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From 26e24916f4dac39ec0db1dfafeb4a1bb012d19e4 Mon Sep 17 00:00:00 2001 |From: "yangxiaoxuan@openanolis.org" |Date: Mon, 21 Jun 2021 12:31:47 +0800 |Subject: [PATCH] sos anolis modify strings | |--- | sos/policies/redhat.py | 38 +++++++++++++++++++------------------- | sos/report/plugins/cs.py | 2 +- | 2 files changed, 20 insertions(+), 20 deletions(-) | |diff --git a/sos/policies/redhat.py b/sos/policies/redhat.py |index e9706d9..7476737 100644 |--- a/sos/policies/redhat.py |+++ b/sos/policies/redhat.py -------------------------- File to patch: Skip this patch? [y] Skipping patch. 10 out of 10 hunks ignored patching file sos/report/plugins/cs.py RPM build errors: error: Bad exit status from /var/tmp/rpm-tmp.JZmaGM (%prep) Bad exit status from /var/tmp/rpm-tmp.JZmaGM (%prep) Child return code was: 1 EXCEPTION: [Error()] Traceback (most recent call last): File "/usr/lib/python3.6/site-packages/mockbuild/trace_decorator.py", line 93, in trace result = func(*args, **kw) File "/usr/lib/python3.6/site-packages/mockbuild/util.py", line 600, in do_with_status raise exception.Error("Command failed: \n # %s\n%s" % (command, output), child.returncode) mockbuild.exception.Error: Command failed: # bash --login -c /usr/bin/rpmbuild -bb --target noarch --nodeps /builddir/build/SPECS/sos.spec