Skip to content

fix CheckFilelist.py python3 - #56

Open
maltek wants to merge 1 commit into
openSUSE:masterfrom
maltek:citests
Open

fix CheckFilelist.py python3#56
maltek wants to merge 1 commit into
openSUSE:masterfrom
maltek:citests

Conversation

@maltek

@maltek maltek commented Feb 20, 2020

Copy link
Copy Markdown

this is currently fixed in OBS through (the last hunk of) rpm415-workaround.diff instead of here.

@mgerstner

Copy link
Copy Markdown
Contributor

The patch in OBS is a bit more complex than your commit:

-        isSUSE = (pkg.header[RPMTAG_VENDOR] and
-                  b'SUSE' in pkg.header[RPMTAG_VENDOR])
+        isSUSE = False
+        if pkg.header[RPMTAG_VENDOR]:
+            vendor = pkg.header[RPMTAG_VENDOR]
+            if isinstance(vendor, str):
+                isSUSE = 'SUSE' in vendor
+            else:
+                isSUSE = b'SUSE' in vendor

it might be better to build in this backward compatibility / robustness into the repo and then simply delete the last hunk from the OBS patch.

@maltek

maltek commented Feb 25, 2020

Copy link
Copy Markdown
Author

Do you foresee us reverting to an old RPM version after 6 months? I see that this compat code was useful to 'bootstrap' the new RPM version without a broken rpmlint at some point. But that new RPM version has been in for some time now.

@mgerstner

Copy link
Copy Markdown
Contributor

Do you foresee us reverting to an old RPM version after 6 months?

No I don't see this. It's just that there might be some weird constellations that we don't know about (backport of rpmlint without rpm into other projects?). And this change is not exactly our domain of responsibility (for the security team), therefore I thought we take the safe route.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants