From: Andrea Zagli <azagli@libero.it>
Date: Tue, 3 Sep 2019 06:43:34 +0000 (+0200)
Subject: Utilizzo di 'branch merged' in debian_tobeupdated, così funziona anche per i pacchett... 
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=5cdd451ad936d8bc64056e698f1c2291f1b6ebc1;p=msys2

Utilizzo di 'branch merged' in debian_tobeupdated, così funziona anche per i pacchetti non snapshot.
---

diff --git a/tools/autobuilder/debian_tobeupdated.sh b/tools/autobuilder/debian_tobeupdated.sh
index e211c2d..90ea027 100755
--- a/tools/autobuilder/debian_tobeupdated.sh
+++ b/tools/autobuilder/debian_tobeupdated.sh
@@ -25,23 +25,10 @@ git pull
 git checkout $CURRENT_BRANCH
 git stash pop
 
-# not empty if there's at least one commit be merged
-TO_BE_MERGED=`git log --pretty=oneline --graph ..$UPSTREAM_BRANCH | head -n 1 | sed -n -e 's/\* //p'`
-TO_BE_MERGED=${TO_BE_MERGED%% *}
-
-echo "Last commit to be merged: "$TO_BE_MERGED
+TO_BE_MERGED=`git branch --merged | grep $UPSTREAM_BRANCH`
 
 if [ "$TO_BE_MERGED" = "" ]; then
-	echo -e "\nNot to be updated."
+	echo -e "\nThe debian branch must be updated."
 else
-	# the snapshot hash of the package
-	SNAPSHOT_HASH=`head -n 1 debian/changelog | sed -n -e 's/.*\((.*)\).*/\1/;s/.*\(\.gbp\(.*\))\)/\2/p'`
-
-	echo "Debian package snapshot version: "$SNAPSHOT_HASH
-
-	if [ "${TO_BE_MERGED:6}" = "$SNAPSHOT_HASH" ]; then
-		echo -e "\nNot to be updated."
-	else
-		echo -e "\nThe debian branch must be updated."
-	fi
+	echo -e "\nNot to be updated."
 fi