Skip to content

Commit

Permalink
deb packaging: avoid problems/workaround with https and SSL
Browse files Browse the repository at this point in the history
  • Loading branch information
megies committed Jul 9, 2013
1 parent a042ceb commit 4b067d2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
4 changes: 2 additions & 2 deletions misc/debian/deb__build_debs.sh
Expand Up @@ -37,10 +37,10 @@ GITDIR=$BUILDDIR/git
# deactivate, else each time all packages are removed
rm -rf $BUILDDIR
mkdir -p $PACKAGEDIR
git clone https://github.com/${GITFORK}/obspy.git $GITDIR
git clone git://github.com/${GITFORK}/obspy.git $GITDIR
if [ "$GITFORK" != "obspy" ]
then
git remote add upstream https://github.com/obspy/obspy.git
git remote add upstream git://github.com/obspy/obspy.git
git fetch upstream
fi

Expand Down
6 changes: 1 addition & 5 deletions misc/scripts/build_all_debs.sh
Expand Up @@ -28,7 +28,7 @@ exec 2>&1 >> $LOG
echo '#############'
echo "#### `date`"

git clone https://github.com/obspy/obspy.git $GITDIR
git clone git://github.com/obspy/obspy.git $GITDIR

for DIST in squeeze wheezy lucid natty oneiric precise quantal raring; do
for ARCH in i386 amd64; do
Expand All @@ -38,10 +38,6 @@ for DIST in squeeze wheezy lucid natty oneiric precise quantal raring; do
git clean -fxd
cd /tmp # can make problems to enter schroot environment from a folder not present in the schroot
COMMAND="cd $DEBSCRIPTDIR; ./deb__build_debs.sh -f $GITFORK -t $GITTARGET &>> $LOG"
if [[ "$DIST" == "quantal" ]]
then
COMMAND="export GIT_SSL_NO_VERIFY=true; $COMMAND"
fi
SCHROOT_SESSION=$(schroot --begin-session -c $DISTARCH)
echo "$COMMAND" | schroot --run-session -c "$SCHROOT_SESSION"
schroot -f --end-session -c "$SCHROOT_SESSION"
Expand Down

0 comments on commit 4b067d2

Please sign in to comment.