Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fix setting GIT_URL for poudriere

  • Loading branch information...
commit fef21878fdb0b1a243f8574577f1e2ccb0c7c48c 1 parent a12327a
Kris Moore kmoore134 authored

Showing 1 changed file with 8 additions and 3 deletions. Show diff stats Hide diff stats

  1. +8 3 scripts/portbuild.sh
11 scripts/portbuild.sh
@@ -18,9 +18,6 @@ sh ${PROGDIR}/scripts/checkprogs.sh
18 18 cStat=$?
19 19 if [ $cStat -ne 0 ] ; then exit $cStat; fi
20 20
21   -# Set the GIT_URL variable for poudriere to work with
22   -GIT_URL="$PORTS_GIT_URL" ; export GIT_URL
23   -
24 21 exit_trap()
25 22 {
26 23 echo -e "Cleaning up poudriere build...\c"
@@ -154,21 +151,29 @@ mk_metapkg_bulkfile()
154 151
155 152 do_portsnap()
156 153 {
  154 + cp /usr/local/etc/poudriere.conf /tmp/.poudriere.conf.$$
  155 + cat /usr/local/etc/poudriere.conf | grep -v "GIT_URL" > /tmp/.poud.tmp.$$
  156 + echo "GIT_URL=\"$PORTS_GIT_URL\" ; export GIT_URL" >> /tmp/.poud.tmp.$$
  157 + mv /tmp/.poud.tmp.$$ /usr/local/etc/poudriere.conf
  158 +
157 159 echo "Updating ports collection..."
158 160 poudriere -l | grep -q "^{POUDPORTS"
159 161 if [ $? -eq 0 ] ; then
160 162 poudriere ports -u -m git -p "$POUDPORTS"
161 163 if [ $? -ne 0 ] ; then
162 164 echo "Failed to update ports $POUDPORTS"
  165 + mv /tmp/.poudriere.conf.$$ /usr/local/etc/poudriere.conf
163 166 exit 1
164 167 fi
165 168 else
166 169 poudriere ports -c -m git -p "$POUDPORTS"
167 170 if [ $? -ne 0 ] ; then
168 171 echo "Failed to create ports $POUDPORTS"
  172 + mv /tmp/.poudriere.conf.$$ /usr/local/etc/poudriere.conf
169 173 exit 1
170 174 fi
171 175 fi
  176 + mv /tmp/.poudriere.conf.$$ /usr/local/etc/poudriere.conf
172 177 }
173 178
174 179 do_pcbsd_portmerge()

0 comments on commit fef2187

Please sign in to comment.
Something went wrong with that request. Please try again.