stable-update-proposal: debian-edu-config

[Petter Reinholdtsen <pere@hungry.com>]

Ref item 9 on <URL:http://wiki.debian.org/DebianEdu/Meeting/20070813>,
here is a update proposal for the stable release.

I propose to update the version of debian-edu-config in the stable
repository from 0.416+svn39072 to 0.416+svn39160.

This update will fix a problem with upgrading packages (breaks apt),
on hosts with files in /etc/ with non-ASCII characters in the file
names (Skolelinux bug #1283).  The exact properties of this bug it is
not known, but the fix will make sure the problem is not breaking apt.

It also fixes a few minor issues with debian-edu-etc-svk, now ignoring
changes in /etc/mtab and using the correct argument in the postinst.

Here is the svn diff of the package changes.

Index: debian/changelog
===================================================================
--- debian/changelog	(revision 39072)
+++ debian/changelog	(working copy)
@@ -1,3 +1,14 @@
+debian-edu-config (0.416+svn39160) terra; urgency=low
+
+  * Do not allow debian-edu-etc-svk commit to  break apt upgrades.
+    Solves Skolelinux bug 1283.
+  * Configure debian-edu-etc-svk to ignore the machine generated
+    file /etc/mtab.
+  * Use debian-edu-etc-svk commit instead of the old update in
+    the postinst.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sat, 24 Nov 2007 12:11:10 +0100
+
 debian-edu-config (0.416+svn39072) terra; urgency=low
 
   * Fix INTERFACE setting in update-hostname-from-ip (Solves Skolelinux
Index: debian/debian-edu-config.postinst
===================================================================
--- debian/debian-edu-config.postinst	(revision 39072)
+++ debian/debian-edu-config.postinst	(working copy)
@@ -13,6 +13,8 @@
     if [ ! -d ~root/.svk ] ; then
 	ETCSVK=true
 	debian-edu-etc-svk init > /dev/null
+    else
+	debian-edu-etc-svk ignore mtab > /dev/null || true
     fi
 fi
 
@@ -128,6 +130,6 @@
 fi
 
 # Register all changes done by this postinst script
-[ true = "$ETCSVK" ] && debian-edu-etc-svk update
+[ true = "$ETCSVK" ] && debian-edu-etc-svk commit
 
 exit 0
Index: sbin/debian-edu-etc-svk
===================================================================
--- sbin/debian-edu-etc-svk	(revision 39072)
+++ sbin/debian-edu-etc-svk	(working copy)
@@ -17,7 +17,7 @@
 sysconfdir=/etc
 
 # Ignore files that are automatically updated every night or more often
-ignorefiles="adjtime ld.so.cache"
+ignorefiles="adjtime ld.so.cache mtab"
 
 # These are automatically updated, but might be useful to track anyway
 #ignorefiles="mtab resolv.conf network/run/ifstate"
@@ -105,6 +105,7 @@
 }
 
 do_commit() {
+    # XXX This code do not handle files with space in their names
     if [ "$(svk status)" ] ; then
 	comment=""
 	delfiles="$(svk status|grep '^! '|awk '{print $2}')"
Index: etcsvk-apt.conf
===================================================================
--- etcsvk-apt.conf	(revision 39072)
+++ etcsvk-apt.conf	(working copy)
@@ -1,2 +1,2 @@
-DPkg::Pre-Install-Pkgs { "if [ -x /usr/sbin/debian-edu-etc-svk ]; then debian-edu-etc-svk commit; fi"; };
-DPkg::Post-Invoke      { "if [ -x /usr/sbin/debian-edu-etc-svk ]; then debian-edu-etc-svk commit; fi"; };
+DPkg::Pre-Install-Pkgs { "if [ -x /usr/sbin/debian-edu-etc-svk ]; then debian-edu-etc-svk commit || true; fi"; };
+DPkg::Post-Invoke      { "if [ -x /usr/sbin/debian-edu-etc-svk ]; then debian-edu-etc-svk commit || true; fi"; };

Happy hacking,
-- 
Petter Reinholdtsen