[MediaWiki-commits] [Gerrit] fixed some bug - change (labs/toollabs)

[Petrb (Code Review)]

Petrb has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/62239


Change subject: fixed some bug
......................................................................

fixed some bug

Change-Id: I51bfe57e5619ddfc6307d01ff2ab0119e10b35c4
---
M bin/rmtool
1 file changed, 11 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/39/62239/1

diff --git a/bin/rmtool b/bin/rmtool
index d0a5d6d..7dada4a 100755
--- a/bin/rmtool
+++ b/bin/rmtool
@@ -43,6 +43,11 @@
         echo "drop database $dbuser;" | mysql mysql
 fi
 
+if [ ! -d /data/project/removed_tools ];then
+    echo "There is no folder to store removed tools!"
+    exit 1
+fi
+
 if [ -d "/data/project/$tool" ];then
        echo "Removing data folder for $tool"
        if [ -d "/data/project/removed_tools/$tool" ];then
@@ -50,6 +55,12 @@
                exit 1
        fi
        mv "/data/project/$tool" "/data/project/removed_tools/$tool/"
+       if [ -f "/data/project/removed_tools/$tool.tar.gz" ];then
+               echo "Unable to tarball the folder because there is another 
tarball with same name"
+       else
+               cd /data/project/removed_tools
+               tar -zcvf "$tool.tar.gz" "$tool"
+       fi
 fi
 
 # get a number of records in /data/project/.system/webservers
@@ -60,11 +71,6 @@
        sleep 10
 done
 
-if [ ! -d /data/project/removed_tools ];then
-    echo "There is no folder to store removed tools!"
-    exit 1
-fi
-
 touch /data/project/.system/webservers.lock
 wc=`cat /data/project/.system/webservers | grep -Ec "^$tool\s.*"`
 
@@ -74,8 +80,6 @@
        echo "Removing webserver"
        cat /data/project/.system/webservers | grep -vE "^$tool\s.*" > 
/tmp/webservers
        mv /tmp/webservers /data/project/.system/webservers
-       cd /data/project/removed_tools
-       tar -zcvf "$tool.tar.gz" "$tool"
 fi
 
 rm /data/project/.system/webservers.lock

-- 
To view, visit https://gerrit.wikimedia.org/r/62239
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I51bfe57e5619ddfc6307d01ff2ab0119e10b35c4
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Petrb <benap...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits