Summary: | app-portage/cfg-update-1.8.0-r5 checks for merge tool even when it won't be called | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | Balint Dobai-Pataky <dpblnt> |
Component: | Current packages | Assignee: | Harald van Dijk (RETIRED) <truedfx> |
Status: | RESOLVED FIXED | ||
Severity: | trivial | CC: | xentric |
Priority: | High | ||
Version: | 2006.1 | ||
Hardware: | AMD64 | ||
OS: | Linux | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- |
Description
Balint Dobai-Pataky
2007-02-02 14:40:25 UTC
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... Stephan, what are your thoughts on this? Should the check for the merge tool be skipped when not merging? 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 :) Harald, I've posted an update (1.8.0-r6) See bug #165041 This bug can be closed. you're fast :) thanks And... added. |