diff --git a/makepending b/makepending index 05c4d1ecdf6e4d616da4ec9801b90a53b9e199e0..152ffb1065db8fbea670f01fe67f776ca7fb83b0 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