Index: trunk/dsys/funcINSTALL
===================================================================
--- trunk/dsys/funcINSTALL	(revision 591)
+++ trunk/dsys/funcINSTALL	(revision 1)
@@ -4,22 +4,4 @@
 #
 #########################################################################
-#
-# Copyright Rainer Wichmann (2005)
-#
-# License Information:
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
 
 getconfopts () {
@@ -62,5 +44,4 @@
     echo "  <client>"
     echo "    <client_host>${host}</client_host>"
-    echo "    <client_group>${hostgroup}</client_group>"
     echo "    <client_os_machine>${arch}</client_os_machine>"
     echo "    <client_install_status>${install_entry}</client_install_status>"
@@ -110,18 +91,4 @@
         DATABASE="${basedir}/${defdatabase}"
     fi
-
-    updlock="${DATABASE}.lockdir"
-    trap "rm -rf ${updlock}" 1 2 13 15
-
-    #
-    # A lockfile will not work, because 'root' can write anyway.
-    # However, 'mkdir' an existing directory will fail even for root
-    #
-    until (umask 222; mkdir "${updlock}") 2>/dev/null   # test & set
-    do
-       printINFO "Waiting for lock"
-       sleep 1
-    done
-
 
     IDATE=`date +"%Y-%m-%d %H:%M:%S"`
@@ -173,10 +140,6 @@
 		if test "x$?" = "x1"
 		then
-		    #
-		    # Write the full entry when client_os_machine is found
-		    #
 		    case "$line" in
 		    *\<client_os_machine\>*\</client_os_machine\>)
-		    echo "    <client_group>${hostgroup}</client_group>"           >>"${tmpF}"
 		    echo "    <client_os_machine>${arch}</client_os_machine>"           >>"${tmpF}"
 		    echo "    <client_install_status>${install_entry}</client_install_status>"    >>"${tmpF}"
@@ -187,25 +150,26 @@
 		    ;;
 
-		    *\<client_group\>*\</client_group\>)
+		    *\<client_install_status\>*\</client_install_status\>)
+                    # echo "    <client_install_status>${install_entry}</client_install_status>"    >>"${tmpF}"
 		    :
 		    ;;
-			
-		    *\<client_install_status\>*\</client_install_status\>)
-		    :
-		    ;;
 
 		    *\<client_install_date\>*\</client_install_date\>)
+                    # echo "    <client_install_date>${IDATE}</client_install_date>"         >>"${tmpF}"
 		    :
 	            ;;
 
 		    *\<client_install_name\>*\</client_install_name\>)
+                    # echo "    <client_install_name>${SH_NAME}</client_install_name>"       >>"${tmpF}"
 		    :
 		    ;;
 
 		    *\<client_install_prefix\>*\</client_install_prefix\>)
+                    # echo "    <client_install_prefix>${SH_PREFIX}</client_install_prefix>" >>"${tmpF}"
 		    :
 		    ;;
 
 		    *\<client_install_version\>*\</client_install_version\>)
+                    # echo "    <client_install_version>${src_version}.${realformat}</client_install_version>" >>"${tmpF}"
 		    :
 		    ;;
@@ -251,5 +215,5 @@
      printINFO "Write ${DATABASE} from scratch"
      echo '<?xml version="1.0" encoding="ISO-8859-1"?>' >"${tmpF}"
-     echo '<!DOCTYPE yule_db SYSTEM "http://la-samhna.de/yule_db-0.2.dtd">' \
+     echo '<!DOCTYPE yule_db SYSTEM "http://la-samhna.de/yule_db-0.1.dtd">' \
 	  >>"${tmpF}"
      echo "<yule_db>"   >>"${tmpF}"
@@ -259,16 +223,7 @@
     fi
 
-    chown ${rcfile_owner}:${rcfile_group} "${DATABASE}"
-    if [ $? -ne 0 ]; then
-    	rm -rf "${updlock}"
-    	printFATAL "Could not chown ${rcfile_owner}:${rcfile_group} ${DATABASE}"
-    fi
-    chmod ${rcfile_perm} "${DATABASE}"
-    if [ $? -ne 0 ]; then
-    	rm -rf "${updlock}"
-    	printFATAL "Could not chmod ${rcfile_perm} ${DATABASE}"
-    fi
-
-    rm -rf "${updlock}"
+    chown ${rcfile_owner}:${rcfile_group} "${DATABASE}" || printFATAL "Could not chown ${rcfile_owner}:${rcfile_group} ${DATABASE}"
+    chmod ${rcfile_perm} "${DATABASE}" || printFATAL "Could not chmod ${rcfile_perm} ${DATABASE}"
+
 }
 
@@ -400,8 +355,4 @@
 	   command="$command other"
 	fi
-        if test $n -eq 0
-        then
-            printFATAL "No binary packages built yet !"
-        fi
 	    
 	eval ${command}