Script controllo agg.: esecuzione del controllo con debian_tobeupdated.sh.

diff --git a/.gitignore b/.gitignore
index afb2a6426a997491b2e1aa87b8d9e4645bfd5006..d04b89515c4217543eff4425f3bf9ffd824641c8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 repository
 tmp
-*.~*~
+*~
+

diff --git a/tools/autobuilder/debian_tobeupdated.sh b/tools/autobuilder/debian_tobeupdated.sh
index 90ea02743f6b7532c964625df19639bee2a5e164..10f871d9ef9e439239abd2004a445522ae63e7ed 100755 (executable)
--- a/tools/autobuilder/debian_tobeupdated.sh
+++ b/tools/autobuilder/debian_tobeupdated.sh
@@ -28,7 +28,9 @@ git stash pop
 TO_BE_MERGED=`git branch --merged | grep $UPSTREAM_BRANCH`
 
 if [ "$TO_BE_MERGED" = "" ]; then
-       echo -e "\nThe debian branch must be updated."
+    echo -e "\nThe debian branch must be updated."
+    exit 1
 else
-       echo -e "\nNot to be updated."
+    echo -e "\nNot to be updated."
+    exit 0
 fi

diff --git a/tools/autobuilder/debian_tobeupdated_all.sh b/tools/autobuilder/debian_tobeupdated_all.sh
index 8c0cd42be7922a22ce8f54ffc151b618c8a7049b..0b4c462381c134013b24653e1307aa6217af17b9 100755 (executable)
--- a/tools/autobuilder/debian_tobeupdated_all.sh
+++ b/tools/autobuilder/debian_tobeupdated_all.sh
@@ -13,10 +13,10 @@ BRANCHES=`git branch -rvv | grep $REMOTE | grep debian | awk '{print $1}'`
 
 > log.log
 
+LEN=$((${#REMOTE} + 1))
+
 for BRANCH in $BRANCHES
 do
-    LEN=$((${#REMOTE} + 1))
-
     BRANCH=${BRANCH:$LEN}
     CHECKED=`git branch | grep $BRANCH`
 
@@ -25,4 +25,9 @@ do
     fi
     
     git checkout $BRANCH &>> log.log
+
+    "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/debian_tobeupdated.sh &>> log.log
+    if [ $? -eq 1 ]; then
+       echo "Branch $BRANCH must be updated."
+    fi
 done