| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame^] | 1 | python/rpmmodules.c: Change the way the python module loads the RPM config |
| 2 | |
| 3 | In order to support the RPM_VENDOR_WINDRIVER enhancement of dynamic |
| 4 | runtime relocation paths, we need to call rpmcliInit instead of |
| 5 | rpmReadConfigFiles. The rpmcliInit will end up calling rpmReadConfigFiles |
| 6 | after the necessary relocation processing (if enabled). |
| 7 | |
| 8 | Code derived from changes suggested by Paul Eggleton. |
| 9 | |
| 10 | Upstream-Status: Pending |
| 11 | |
| 12 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 13 | |
| 14 | Index: rpm-5.4.14/python/rpmmodule.c |
| 15 | =================================================================== |
| 16 | --- rpm-5.4.14.orig/python/rpmmodule.c |
| 17 | +++ rpm-5.4.14/python/rpmmodule.c |
| 18 | @@ -392,7 +392,8 @@ void init_rpm(void) |
| 19 | if (Py_AtExit(rpm_exithook) == -1) |
| 20 | return; |
| 21 | |
| 22 | - rpmReadConfigFiles(NULL, NULL); |
| 23 | + const char *argv[1] = {"rpmmodule", 0}; |
| 24 | + rpmcliInit(1, argv, NULL); |
| 25 | |
| 26 | d = PyModule_GetDict(m); |
| 27 | |