Merge branch 'master' into toutatis

This commit is contained in:
Rubén Rodríguez 2012-11-12 21:15:18 +01:00
commit e52fad1df5

View file

@ -44,10 +44,9 @@ UPSTREAM=$(grep 'export UPSTREAM=' helpers/config |sed 's/.*=//')
WORKDIR=tmp/makepackage WORKDIR=tmp/makepackage
REPOSITORY=$PWD/repos/$CODENAME REPOSITORY=$PWD/repos/$CODENAME
HELPERS=$PWD/helpers HELPERS=$PWD/helpers
if ! [ -d repos/ ]
then
for REPO in $(git branch|sed 's/.* //;/master/d') for REPO in $(git branch|sed 's/.* //;/master/d')
do do
[ -d $REPOSITORY ] && continue
mkdir -p repos/$REPO/conf repos/$REPO/incoming mkdir -p repos/$REPO/conf repos/$REPO/incoming
cat << EOF > repos/$REPO/conf/distributions cat << EOF > repos/$REPO/conf/distributions
Origin: Trisquel Origin: Trisquel
@ -74,7 +73,6 @@ cd repos/$REPO
reprepro -v export reprepro -v export
cd ../.. cd ../..
done done
fi
disablescripts(){ disablescripts(){
# Disable service starter scripts # Disable service starter scripts