Description of problem: A merge of two configuration files will fail if vimdiff (from vim-enhanced) isn't installed. Version-Release number of selected component (if applicable): yum-merge-conf-1.1.4-1.fc7 How reproducible: Everytime Steps to Reproduce: Example 1. install mock-0.6.12 2. change /etc/mock/defaults.cfg 3. update to mock-0.7.1 from updates-testing 4. try to merge the configurations with vim (v) Actual results: sh: vimdiff: command not found Expected results: vimdiff should start to merge the configurations Additional info: By default, RPM would keep your local version and rename the new one to /etc/mock/defaults.cfg.rpmnew What do you want to do ? - diff the two versions (d) - do the default RPM action (q) - install the package's version (i) - merge interactively with vim (v) - background this process and examine manually (z) Your answer ? v sh: vimdiff: command not found
Any comments Aurélien ?
That's right, the plugin does an os.system("vimdiff old-file new-file"). The package should Require: vim-enhanced
OR, it could check if vimdiff is in the path and only propose vim-based merge if it is. I can do that, it's pretty easy. Should I send you a patch ?
Just send me patch and i will add it.
Created attachment 157202 [details] Here's the patch to detect vimdiff
Thanks, it is added to upstream CVS
yum-utils-1.1.5-1.fc7 has been pushed to the Fedora 7 testing repository. If problems still persist, please make note of it in this bug report.
yum-utils-1.1.5-1.fc7 has been pushed to the Fedora 7 stable repository. If problems still persist, please make note of it in this bug report.
It's working. If vimdiff isn't installed, there would be no option to merge the configs: By default, RPM would keep your local version and rename the new one to /etc/mock/defaults.cfg.rpmnew What do you want to do ? - diff the two versions (d) - do the default RPM action (q) - install the package's version (i) - background this process and examine manually (z)