Your message dated Thu, 03 Apr 2008 03:32:04 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#473473: fixed in ucf 3.006
has caused the Debian Bug report #473473,
regarding ucf: fails to catch conflicts on three-way merging
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.)
--
473473: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473473
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
--- Begin Message ---
Package: ucf
Version: 3.005
Severity: normal
Tags: patch
When three-way merging has a conflict and diff3 exits with a non-zero
status, the postinst exits immediately as "set -e" is in effect.
The attached trivial patch fixes this so that the conflict error message
gets printed instead.
Cheers,
--
Niko Tyni [EMAIL PROTECTED]
diff --git a/ucf b/ucf
index c797911..22ffb7d 100755
--- a/ucf
+++ b/ucf
@@ -927,10 +927,11 @@ EOPEND
echo >&2 "Merging changes into the new version"
if [ -e "$statedir/cache/$cached_file" \
-a "X$THREEWAY" != "X" ]; then
+ ret=0
diff3 -L Current -L Older -L New -m \
"$dest_file" "$statedir/cache/$cached_file" \
- "$new_file" > $dest_file.${NEW_SUFFIX}
- case "$?" in
+ "$new_file" > $dest_file.${NEW_SUFFIX} || ret=$?
+ case "$ret" in
0)
new_file="$dest_file.${NEW_SUFFIX}"
RETAIN_OLD=YES
--- End Message ---
--- Begin Message ---
Source: ucf
Source-Version: 3.006
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.006.dsc
to pool/main/u/ucf/ucf_3.006.dsc
ucf_3.006.tar.gz
to pool/main/u/ucf/ucf_3.006.tar.gz
ucf_3.006_all.deb
to pool/main/u/ucf/ucf_3.006_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: Wed, 02 Apr 2008 22:13:21 -0500
Source: ucf
Binary: ucf
Architecture: source all
Version: 3.006
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: 473473
Changes:
ucf (3.006) unstable; urgency=low
.
* Bug fix: "ucf: fails to catch conflicts on three-way merging", thanks
to Niko Tyni. Closes: #473473
Files:
c7504d3e032619dba377c0ab3797bc03 649 utils optional ucf_3.006.dsc
c03334fe8b72a100671e5b3d3a1fc5fb 81318 utils optional ucf_3.006.tar.gz
f248de6669209b0f1f0a788d43b18680 61558 utils optional ucf_3.006_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFH9E3EIbrau78kQkwRAtYUAKCw2RRdC7M/2vJ7foEBfZTO90mRqgCgzMby
RE6NviVft2aOLePWxvSdNZs=
=BZT2
-----END PGP SIGNATURE-----
--- End Message ---
