From e64a48c7b519159fea92740aa0779b63742fc227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Rodr=C3=ADguez?= <ruben@trisquel.info>
Date: Sun, 14 Oct 2012 23:15:28 +0200
Subject: [PATCH] Added extra git handlers
---
makepending | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/makepending b/makepending
index 05c4d1ec..152ffb10 100644
--- a/makepending
+++ b/makepending
@@ -120,10 +120,11 @@ then
continue
fi
+ $TEST git checkout $DISTRO
+ $TEST git merge master
echo Upgrading $current at $DISTRO with ${UPSTREAM}_$upstream 1>&2
echo Running makepackage $package $DISTRO at $(date) $LOGS/$DISTRO-$package-$(date +%Y%m%d).log
echo Running makepackage $package $DISTRO at $(date) $LOGS/$DISTRO-$package-$(date +%Y%m%d).log 1>&2
- git checkout $DISTRO
$TEST sh $WD/makepackage $package $DISTRO > $LOGS/$DISTRO-$package-$(date +%Y%m%d).log && echo -n Done! || echo -n FAILED!
echo " ($(date))"
echo
--
GitLab