Re: [PATCH 2/2] Don't require python3 for a string replace

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




El 15/1/19 a las 21:02, Laura Abbott escribió:
On 1/15/19 1:44 AM, pablo@xxxxxxxxxxxxxxxx wrote:
From: Pablo Greco <pablo@xxxxxxxxxxxxxxxx>

---
  kernel.spec | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel.spec b/kernel.spec
index aaaa280..25ad968 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1228,7 +1228,7 @@ BuildKernel() {
        # make sure EXTRAVERSION says what we want it to say
      # Trim the release if this is a CI build, since KERNELVERSION is limited to 64 characters -    ShortRel=$(python3 -c "import re; print(re.sub(r'\.pr\.[0-9A-Fa-f]{32}', '', '%{release}'))") +    ShortRel=$(perl -e "print \"%{release}\" =~ s/\.pr\.[0-9A-Fa-f]{32}//r")       perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -${ShortRel}.%{_target_cpu}${Flav}/" Makefile         # if pre-rc1 devel kernel, must fix up PATCHLEVEL for our versioning scheme


So I was seeing this cause a build failure when I tried a scratch build

https://koji.fedoraproject.org/koji/taskinfo?taskID=32051959

I've been having problems sometimes with line endings so it might have been
a problem with how I applied the patch but did this work for you?

I can't find where I built it, but I know I did (locally, not koji)
I also tested a script comparing the output of both  commands (python and perl) and neither of those print \r. Adding a fake \r to my test script creates the same output as I see in your build.log, but I can't confirm since I can't download the .src.rpm from koji. Either way, I'm doing a test build before going to sleep, I'll let you know tomorrow.

Pablo.
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx




[Index of Archives]     [Fedora General Discussion]     [Older Fedora Users Archive]     [Fedora Advisory Board]     [Fedora Security]     [Fedora Devel Java]     [Fedora Legacy]     [Fedora Desktop]     [ATA RAID]     [Fedora Marketing]     [Fedora Mentors]     [Fedora Package Announce]     [Fedora Package Review]     [Fedora Music]     [Fedora Packaging]     [Centos]     [Fedora SELinux]     [Coolkey]     [Yum Users]     [Tux]     [Yosemite News]     [KDE Users]     [Fedora Art]     [Fedora Docs]     [USB]     [Asterisk PBX]

  Powered by Linux