Your message dated Thu, 21 Feb 2008 07:32:04 +0000 with message-id <[EMAIL PROTECTED]> and subject line Bug#456245: fixed in ucf 3.005 has caused the Debian Bug report #456245, regarding ucf: three-way merge unable to merge changes already made locally? to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact [EMAIL PROTECTED] immediately.) -- 456245: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=456245 Debian Bug Tracking System Contact [EMAIL PROTECTED] with problems
--- Begin Message ---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]
--- End Message ---
--- Begin Message ---Source: ucf Source-Version: 3.005 We believe that the bug you reported is fixed in the latest version of ucf, which is due to be installed in the Debian FTP archive: ucf_3.005.dsc to pool/main/u/ucf/ucf_3.005.dsc ucf_3.005.tar.gz to pool/main/u/ucf/ucf_3.005.tar.gz ucf_3.005_all.deb to pool/main/u/ucf/ucf_3.005_all.deb A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to [EMAIL PROTECTED], and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Manoj Srivastava <[EMAIL PROTECTED]> (supplier of updated ucf package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing [EMAIL PROTECTED]) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Format: 1.7 Date: Thu, 21 Feb 2008 01:10:57 -0600 Source: ucf Binary: ucf Architecture: source all Version: 3.005 Distribution: unstable Urgency: low Maintainer: Manoj Srivastava <[EMAIL PROTECTED]> Changed-By: Manoj Srivastava <[EMAIL PROTECTED]> Description: ucf - Update Configuration File: preserve user changes to config files. Closes: 424926 456241 456245 460868 464238 Changes: ucf (3.005) unstable; urgency=low . * Bug fix: "ucfq /path/to/file is broken", thanks to Niko Tyni. Applied the patch provided in the report. Closes: #460868 * Of course, this did not mean that the modified column was actually filled with valid values: A number of places we were not using the proper accessor methods, which added to the confusion. Fixed. Closes: #464238 * Add a new --debconf-template option to specify an alternate caller-provided debconf template for the user prompt. Heavy lifting done by Steve Langasek. This was apparently done to allow grub in Ubuntu to manage partial file fragments. Closes: #456241. * Use db_x_loadtemplatefile instead of debconf-loadtemplates for template loading, and depend on debconf (>= 1.5.19) | cdebconf for the implementation. Thanks to Steve Langasek. Closes: #424926 * Drop the Recommends: debconf-utils now that it's no longer used. * Instead of proceeding merrily on our way if the three way merge fails, we now leave the dest file unchanged, leave the mess in the new file (foo.ucf-new), tell the user about it, and abort the upgrade by exiting with exit 3. We still psit out an error about conflicts. Hopefully, this adequately resolves the bug. Closes: #456245 Files: 714354fb759f2a1430f3b904ba7ea3a3 648 utils optional ucf_3.005.dsc 6c8b06b32a387d9c136990042d0e075e 82832 utils optional ucf_3.005.tar.gz 7615e0b9a05f3ad3a133329e2b8089ac 61234 utils optional ucf_3.005_all.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFHvSb5Ibrau78kQkwRAnkDAJ0Y40e8GFhosDGUTVAPcoUKwLMZRQCePbSF wnk6ulyZr+bY6DykfilkSSc= =X7Q3 -----END PGP SIGNATURE-----
--- End Message ---
