(need double check with proper selinux installation, tested just in podman)

I've also left symlink to /usr/share/kojihub. Mainly for not changing httpd.conf with every python update.

I always imagined we'd keep a stub loader in /usr/share/koji-hub. E.g. something like from kojihub.kojixmlrpc import application.

+1 for not changing httpd.conf for every python version :smile:

If we rename hub/ → kojihub/ then PYTHONPATH=$CHECKOUT_DIR would make that import work as expected.

it is not nice that we have koji, koji_cli and kojihub modules

I kind of like having some separation indicating that these are not part of the core library, but yeah.

Could always adjust and leave compat wrappers

Addressed comments. One more slight incompatilibity in regard to plugins. As kojihub.__init__.py contains from .kojihub import *, private functions are not imported into that namespace. So, sidetag_hub.py is calling from kojihub.kojihub import. I'm not sure if it is good enough. On one hand I like separation of private methods to submodule, on the other hand some plugins can stop work.

We could always add some explicit imports of those private functions for backwards compatibility. We have internal plugins that rely on some of them as well. Granted, it's an easy enough change to make and plugins have a different expectation of compatibility across versions.

devtools/fakehub2 also needs the path fix

Added private functions to kojihub/__init__.py. Do you've some problems with fakehub? It works for me with current path.

Do you've some problems with fakehub?

Oh, haha. Apparently fakehub2 is only in my checkout. The fakehub script works fine. Sorry for the confusion.

ok, lgtm

@mikem One more question - placeholder /usr/share/koji-hub/kojiapp.py means updating httpd.conf. Not sure if it is better to use confusing kojixmlrpc.py placeholder name or to force admins to update their configurations.

kojiapp is certainly a better name, but I'm not sure that kojixmlrpc is that confusing. We could always put a comment in the file explaining that the name is for backward compat.

I guess if we wanted to get fancy, we could have both, but issue a deprecation warning when loading the old one. Not sure if it's worth the effort.

The other issue is namespace collision, in two ways. Currently, kojiapp.py and kojixmlrpc.py are in the same directory in the the checkout, so a simple rename would collide them. Also, I'm not entirely sure that we couldn't have a situation where plugin code had import kojixmlrpc and got the wrong one. Granted, I'm not sure any plugins do that.

Actually, regardless of the name, it seems wrong for kojiapp.py to be in the same dir of the checkout as the rest, since it is not part of the lib. It would probably be better to clearly separate the lib from the app here. Perhaps move kojiapp.py (or whatever we call it), httpd.conf, and hub.conf elsewhere? E.g. hub-app, kojihub/app?

Moved to kojihub/app and leaving kojiapp.py without duplicate kojixmlrpc.py

Commit 463e469b fixes this pull-request