Update critpath.py for f32 branched #9284

Merged
jnsamyak merged 2 commits from f32-critpath-branching into master 2026-06-08 03:11:38 +00:00
Contributor

Signed-off-by: Mohan Boddu mboddu@bhujji.com

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
Contributor

why is this getting lower?

why is this getting lower?
Owner

@churchyard because 32 hasn't been released yet, so it has no release/32 directory, it's under development still.

We are debugging this in #fedora-releng if you want to drop by. :)

@churchyard because 32 hasn't been released yet, so it has no release/32 directory, it's under development still. We are debugging this in #fedora-releng if you want to drop by. :)
Contributor

Unfortunately, this is too late for me. This has been a long day :(

Unfortunately, this is too late for me. This has been a long day :(
Owner

No problem. @mohanboddu got the lists and updated rawhide and branched and will try and do the others tonight.

I got:

Traceback (most recent call last):
File "./critpath.py", line 341, in
f.write(packagename + b'\n')
TypeError: can only concatenate str (not "bytes") to str

at the end for some reason. ;(

No problem. @mohanboddu got the lists and updated rawhide and branched and will try and do the others tonight. I got: Traceback (most recent call last): File "./critpath.py", line 341, in <module> f.write(packagename + b'\n') TypeError: can only concatenate str (not "bytes") to str at the end for some reason. ;(
Contributor

A wild guess:

        if args.nvr:
            critpath.update([nvr(p).encode('utf8') for p in pkgs])
        elif args.srpm:
            critpath.update([get_source(p.sourcerpm) for p in pkgs])
        else:
            critpath.update([p.name.encode('utf8') for p in pkgs])

This seem to put bytes, str, bytes into the set.
Ideally, this should all work just with str, but as a short term fix, I suggest trying to add encode call to the elif branch.

(I might be completely wrong.)

A wild guess: ``` if args.nvr: critpath.update([nvr(p).encode('utf8') for p in pkgs]) elif args.srpm: critpath.update([get_source(p.sourcerpm) for p in pkgs]) else: critpath.update([p.name.encode('utf8') for p in pkgs]) ``` This seem to put bytes, str, bytes into the set. Ideally, this should all work just with str, but as a short term fix, I suggest trying to add `encode` call to the `elif` branch. (I might be completely wrong.)
Author
Contributor

FYI, WIP, please dont merge it.

FYI, WIP, please dont merge it.
Author
Contributor

rebased onto 54a47c5ca65e3887cbb0e89652e4de8f293275f1

rebased onto 54a47c5ca65e3887cbb0e89652e4de8f293275f1
Author
Contributor

Okay, its ready to merge now.

Okay, its ready to merge now.
Owner

+1 to merge if this is the working version...

+1 to merge if this is the working version...
Author
Contributor

rebased onto a658a43a40

rebased onto a658a43a406eaf4302070ee8e9e582e2182872b6
Author
Contributor

Pull-Request has been merged by mohanboddu

Pull-Request has been merged by mohanboddu
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
releng/tickets!9284
No description provided.