Fix wrong $ignore initialization.

[nethome.git] / bin / mocksetup

diff --git a/bin/mocksetup b/bin/mocksetup
index 3ff3536..aec4404 100755 (executable)
--- a/bin/mocksetup
+++ b/bin/mocksetup
@@ -40,6 +40,12 @@ for r in $l;do
   lockfile -l 10 $rpath/MOCK.mocksetup-lock
   echo >&2 " done"
 
+  if $soft && [ -f $rpath/MOCK ];then
+    rm -f $rpath/MOCK.mocksetup-lock
+    echo >&2 "Unlocked $rpath/MOCK.mocksetup-lock ."
+    continue
+  fi
+
   l=""
   b=""
   for p in /proc/*/root;do
@@ -58,12 +64,6 @@ for r in $l;do
     continue
   fi
 
-  if $soft && [ -f $rpath/MOCK ];then
-    rm -f $rpath/MOCK.mocksetup-lock
-    echo >&2 "Unlocked $rpath/MOCK.mocksetup-lock ."
-    continue
-  fi
-
   rm -f $rpath/MOCK
 
   # It fails on already mounted /proc.  But we do not need it.
@@ -107,7 +107,12 @@ for r in $l;do
     echo $c
   done
   if ! $u;then
-    c="mount --bind /var/cache/mock/$r/yum_cache $rpath/var/cache/yum"
+    if [ -d /var/cache/mock/$r/yum_cache ];then
+      cr=$r
+    else
+      cr=`echo $r|sed 's/-[^-]*$//'`
+    fi
+    c="mount --bind /var/cache/mock/$cr/yum_cache $rpath/var/cache/yum"
     echo $c; $c
   fi