Package: ucf Version: 3.004 The diff3 merge option in ucf doesn't seem to work very well at present. While experimenting with use of ucf for samba's smb.conf, I found that the three-way merge will fail if changes introduced in the new package version are already present in the locally-modified file:
# This boolean parameter controls whether Samba attempts to sync the Unix # password with the SMB password when the encrypted SMB password in the # passdb is changed. <<<<<<< Older ; unix password sync = no ======= unix password sync = yes >>>>>>> New This seems like a rather important case for diff3 to be able to handle correctly? (Yes, I realize the diff3 support is marked as "experimental" in ucf, but this is also rather important functionality if ucf is to be useful for complex config files like smb.conf, so I'm keen to see this fixed.) Feel free to reassign this bug to diff if this is a diff3 bug; but I think it's also a bug that ucf doesn't give any feedback to the caller when the merge has failed, instead exiting 0 and leaving it up to the admin to clean up after a maintainer script that claims to have succeeded in spite of leaving the config file in a detectably inconsistent state. Indeed, ucf goes so far as to spit a message out to stderr about the conflicts being found, but gives the maintainer script no control over this behavior. Cheers, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ [EMAIL PROTECTED] [EMAIL PROTECTED] -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]