diff --git a/makepkg b/makepkg index 6a36f0b..420c975 100755 --- a/makepkg +++ b/makepkg @@ -21,7 +21,7 @@ else VERSION=$CURRENT_BRANCH if [ ! "$CURRENT_SUBBR" = 'master' ]; then echo "impossible de déterminer la branche" - exit 1 + exit 1 fi ORI_BR=$VERSION/master fi @@ -38,6 +38,17 @@ echo "attention version $VERSION ($DEPOT)" DIST_BR=dist/eole/$VERSION/master git push git checkout $DIST_BR +if [ $CURRENT_BRANCH = 'master' ]; then + if grep Zgzip debian/rules -q Zgzip debian/rules; then + echo "compilable en 2.9" + else + echo "NON COMPILABLE EN 2.9" + echo "Voir des exemples de modifications ici : https://dev-eole.ac-dijon.fr/issues/33643#note-6" + git checkout $ORI_BR + git branch -d $DIST_BR + exit 1 + fi +fi git pull --rebase git merge $ORI_BR git push