CVS: brutus/elaine/lunar+versions/functions install.lunar, 1.2, 1.3 locking.lunar, 1.2, 1.3

[elaine at lunar-linux.org]

Update of /var/cvs/lunar/brutus/elaine/lunar+versions/functions
In directory dbguin.lunar-linux.org:/tmp/cvs-serv23346

Modified Files:
	install.lunar locking.lunar 
Log Message:
removed incorrect locking changes


Index: install.lunar
===================================================================
RCS file: /var/cvs/lunar/brutus/elaine/lunar+versions/functions/install.lunar,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- install.lunar	5 Sep 2003 03:41:54 -0000	1.2
+++ install.lunar	5 Sep 2003 13:25:29 -0000	1.3
@@ -460,9 +460,8 @@
 
 lin_locked()  {
   debug_msg "lin_locked ($@)"
-  LOCK_SNAME=$(echo $1 | sed 's:/:.:g')
-  [     -f        /var/lock/installing.$LOCK_SNAME  ]  &&
-  ps        `cat  /var/lock/installing.$LOCK_SNAME`    |
+  [     -f        /var/lock/installing.$1  ]  &&
+  ps        `cat  /var/lock/installing.$1`    |
   grep  -q  "lin"
 }
 

Index: locking.lunar
===================================================================
RCS file: /var/cvs/lunar/brutus/elaine/lunar+versions/functions/locking.lunar,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- locking.lunar	5 Sep 2003 03:41:54 -0000	1.2
+++ locking.lunar	5 Sep 2003 13:25:29 -0000	1.3
@@ -25,9 +25,6 @@
       #locking is disabled if ln or rm not found!!
       [ -x "/bin/ln" ] || return 0
       [ -x "/bin/rm" ] || return 0
-#      LOCK_SNAME=$(echo $1 | sed 's:/:.:g')
-#      TEMPFILE="$LOCK_SNAME.$$"
-#      LOCKFILE="$LOCK_SNAME.lock"
 
       TEMPFILE="$1.$$"
       LOCKFILE="$1.lock"
@@ -63,7 +60,6 @@
    }
 
    while ! file_lock $1
-#   while ! file_lock $LOCK_SNAME
    do
       message "${MESSAGE_COLOR}Waiting to lock the file $1${DEFAULT_COLOR}"
       sleep 1
@@ -77,11 +73,9 @@
 # purpose : unlocks a file
 function unlock_file() {
   debug_msg "unlock_file ($@)"
-#  LOCK_SNAME=$(echo $1 | sed 's:/:.:g')
   #unlocking is disabled if rm not found!!
   [ -x "/bin/rm" ] || return 0
   rm -f $1.lock 2>/dev/null && return 0
-#  rm -f $LOCK_SNAME.lock 2>/dev/null && return 0
   return 1
 }