Bug#684355: unblock: autofs/5.0.7-2

[Michael Tokarev <mjt@tls.msk.ru>]

Control: retitle -1 unblock: autofs/5.0.7-2

Since the previous email, one more neat way to break
ucf file ownership tansfer when renaming a package
has been found, #689747, which I just fixed.

Initially we queried just one file which is supposed
to be owned by old autofs5 - default/autofs, but it
turned out that each file has to be handled separately,
which is now implemented.

This all is a result of a bugfix in 5.0.6-3, when I
stopped transferring ucf-ownership forcible but started
doing it conditionally, only of previously ownership
belonged to autofs5.  That was a bugfix without a
separate BTS entry.  Initial issue is that I do not
want to transfer ownership of these files if they
currently belong to some other package, if that's
_ever_ possible, so using --force unconditionally
does not look sane.  Maybe I'm wrong here and always
using --force for ucf file registration is okay, but
the current version look more or less robust anyway.

The small debdiff between 5.0.7-1 and 5.0.7-2 follows.

Please consider unblocking the package.

unblock autofs/5.0.7-2

Thank you for your time!

/mjt


diff -Nru autofs-5.0.7/debian/autofs.postinst autofs-5.0.7/debian/autofs.postinst
--- autofs-5.0.7/debian/autofs.postinst	2012-09-03 08:52:07.000000000 +0400
+++ autofs-5.0.7/debian/autofs.postinst	2012-10-06 13:00:26.000000000 +0400
@@ -2,17 +2,15 @@
 set -e

 if [ "$1" = "configure" ]; then
-  # transfer ownership from old autofs5 package
-  case "$(ucfq -w /etc/default/autofs)" in
-    *:autofs5:*) force=--force ;;
-    *) force= ;;
-  esac
-  for map in master net misc smb; do
-    ucfr $force autofs /etc/auto.$map
-    ucf /usr/share/autofs/conffiles/auto.$map /etc/auto.$map
+  for file in auto.master auto.net auto.misc auto.smb default/autofs; do
+    # transfer ownership from old autofs5 package
+    case "`ucfq -w /etc/$file`" in
+      *:autofs5:*) force=--force ;;
+      *) force= ;;
+    esac
+    ucfr $force autofs /etc/$file
+    ucf /usr/share/autofs/conffiles/$file /etc/$file
   done
-  ucfr $force autofs /etc/default/autofs
-  ucf /usr/share/autofs/conffiles/default/autofs /etc/default/autofs
 fi

 # In version 5.0.6 (wheezy), the package has been renamed
diff -Nru autofs-5.0.7/debian/changelog autofs-5.0.7/debian/changelog
--- autofs-5.0.7/debian/changelog	2012-09-26 21:15:05.000000000 +0400
+++ autofs-5.0.7/debian/changelog	2012-10-06 13:06:37.000000000 +0400
@@ -1,3 +1,10 @@
+autofs (5.0.7-2) unstable; urgency=low
+
+  * force transfer ucf autofs5=>autofs ownership for all ucf-managed
+    files (Closes: #689747)
+
+ -- Michael Tokarev <mjt@tls.msk.ru>  Sat, 06 Oct 2012 13:06:37 +0400
+
 autofs (5.0.7-1) unstable; urgency=low

   * new upstream (5.0.7) release.  It brings the following changes: