Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix jail update with patch: #317

Closed
wants to merge 2 commits into from
Closed

Fix jail update with patch: #317

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c8602d
Fix jail update with patch:
rbgarga May 21, 2015
dd906be
Silence svn revert output
rbgarga May 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/share/poudriere/jail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,17 +448,19 @@ install_from_svn() {
msg_n "Checking out the sources from svn..."
${SVN_CMD} -q co ${proto}://${SVN_HOST}/base/${VERSION} ${SRC_BASE} || err 1 " fail"
echo " done"
if [ -n "${SRCPATCHFILE}" ]; then
msg_n "Patching the sources with ${SRCPATCHFILE}"
${SVN_CMD} -q patch ${SRCPATCHFILE} ${SRC_BASE} || err 1 " fail"
echo done
fi
else
msg_n "Updating the sources from svn..."
${SVN_CMD} upgrade ${SRC_BASE} 2>/dev/null || :
${SVN_CMD} revert -q -R ${SRC_BASE} 2>/dev/null || :
${SVN_CMD} status ${SRC_BASE} | grep ^\? | cut -c9- | xargs rm -r 2>/dev/null || :
${SVN_CMD} -q update -r ${TORELEASE:-head} ${SRC_BASE} || err 1 " fail"
echo " done"
fi
if [ -n "${SRCPATCHFILE}" ]; then
msg_n "Patching the sources with ${SRCPATCHFILE}"
${SVN_CMD} -q patch ${SRCPATCHFILE} ${SRC_BASE} || err 1 " fail"
echo done
fi
build_and_install_world

svn_rev=$(${SVN_CMD} info ${SRC_BASE} |
Expand Down