164986 2007-02-02 14:40 0000 app-portage/cfg-update-1.8.0-r5 checks for merge tool even when it won't be called 2007-02-03 07:44:26 0000 1 1 1 Unclassified Gentoo Linux Applications 2006.1 AMD64 Linux RESOLVED FIXED P2 trivial --- 1 dpblnt@gmail.com truedfx@gentoo.org xentric@zeelandnet.nl dpblnt@gmail.com 2007-02-02 14:40:25 0000 as root when i emerge, i don't always have X available, but i have meld in my cfg-update.conf, so i can sux cfg-update with it. cfg-update when it should just check for config files, and not do update (so it does not need meld) complains before my emerge process: * GUI not available, unable to run the mergetool set in /etc/cfg-update.conf! Run cfg-update from within an X-terminal if you want to use a GUI mergetool. If you are getting this from within an X-terminal, you should try running "xhost +localhost" as the user who started the X-server. If you use this script on a system without an X-server you should permanently set the MERGETOOL variable in /etc/cfg-update.conf to vimdiff or sdiff. I recommend the more advanced vimdiff on systems without an X-server. See http://people.zeelandnet.nl/xentric for vimdiff usage instructions. this is not desired. Reproducible: Always Steps to Reproduce: Expected Results: clean as it was. jakub@gentoo.org 2007-02-02 14:47:08 0000 What exactly are you complaining about here? If you don't want to use GUI, then don't stick a GUI diff tool into cfg-update.conf?! Anything unclear about the message? Sigh... truedfx@gentoo.org 2007-02-02 18:37:05 0000 Stephan, what are your thoughts on this? Should the check for the merge tool be skipped when not merging? xentric@zeelandnet.nl 2007-02-02 19:22:43 0000 Balint is right, I have just fixed it like this: The GUI is only needed for updating without the -a option. So I've put the GUI-check in a separate subroutine that is only called from within the update_files subroutine, and only if the -a or -p flag is not found. So "cfg-update -l" works because itwithout a GUI and no message is displayed. "cfg-update -au" works because automatic-only-updating doesn't need the GUI. "cfg-update -pu" works because pretend-update doesn't need the GUI. But with "cfg-update -u" it will display the message and exit. Will post cfg-update-1.8.0-r6 soon... A temporary workaround is to use "cfg-update -l -t diff", that sets the mergetool to CLI diff. Thanks Balint for reporting this :) xentric@zeelandnet.nl 2007-02-02 20:29:36 0000 Harald, I've posted an update (1.8.0-r6) See bug #165041 This bug can be closed. dpblnt@gmail.com 2007-02-03 06:29:46 0000 you're fast :) thanks truedfx@gentoo.org 2007-02-03 07:44:26 0000 And... added.