[src/trunk]: src/distrib/utils/sysinst /usr/X11R7/lib/X11/xkb/symbols/pc went...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6ad55ee7dee3
branches:  trunk
changeset: 747992:6ad55ee7dee3
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Oct 08 06:41:43 2009 +0000

description:
/usr/X11R7/lib/X11/xkb/symbols/pc went from a directory to a file, so on
upgrades we need to remove it before extracting the xbase set, otherwise
we end up in a puddle of suck.

diffstat:

 distrib/utils/sysinst/util.c |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (24 lines):

diff -r 572b2ac742a0 -r 6ad55ee7dee3 distrib/utils/sysinst/util.c
--- a/distrib/utils/sysinst/util.c      Thu Oct 08 05:28:22 2009 +0000
+++ b/distrib/utils/sysinst/util.c      Thu Oct 08 06:41:43 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.c,v 1.159 2009/09/07 02:31:53 jnemeth Exp $       */
+/*     $NetBSD: util.c,v 1.160 2009/10/08 06:41:43 snj Exp $   */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -668,6 +668,14 @@
        } else
                target_chdir_or_die("/");
 
+       /*
+        * /usr/X11R7/lib/X11/xkb/symbols/pc was a directory in 5.0
+        * but is a file in 5.1 and beyond, so on upgrades we need to
+        * delete it before extracting the xbase set.
+        */
+       if (update && dist->set == SET_X11_BASE)
+               run_program(0, "rm -rf usr/X11R7/lib/X11/xkb/symbols/pc");
+
        /* now extract set files into "./". */
        rval = run_program(RUN_DISPLAY | RUN_PROGRESS, 
                        "progress -zf %s tar --chroot -xhepf -", path);