summaryrefslogtreecommitdiffstats
path: root/tools/builder_common.sh
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-09-25 07:53:21 -0300
committerRenato Botelho <renato@netgate.com>2015-09-25 07:53:21 -0300
commit7d26baf38a6fdbdddf256821d207d9c7ea57e556 (patch)
tree6196e8ada9a3c2b3684dc93f464fd6db3bedea87 /tools/builder_common.sh
parentcfa7f409663a1abf869b9efaa4b156f461c9c49a (diff)
downloadpfsense-7d26baf38a6fdbdddf256821d207d9c7ea57e556.zip
pfsense-7d26baf38a6fdbdddf256821d207d9c7ea57e556.tar.gz
Respect .gitignore when call git clean
Diffstat (limited to 'tools/builder_common.sh')
-rw-r--r--tools/builder_common.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index caf4ae8..7cacc91 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -1430,7 +1430,7 @@ update_freebsd_sources() {
CUR_BRANCH=$(cd ${FREEBSD_SRC_DIR} && git branch | grep '^\*' | cut -d' ' -f2)
if [ ${_full} -eq 0 -a "${CUR_BRANCH}" = "${_FREEBSD_BRANCH}" ]; then
_CLONE=0
- ( cd ${FREEBSD_SRC_DIR} && git clean -fxd; git fetch origin; git reset --hard origin/${_FREEBSD_BRANCH} ) 2>&1 | grep -C3 -i -E 'error|fatal'
+ ( cd ${FREEBSD_SRC_DIR} && git clean -fd; git fetch origin; git reset --hard origin/${_FREEBSD_BRANCH} ) 2>&1 | grep -C3 -i -E 'error|fatal'
else
rm -rf ${FREEBSD_SRC_DIR}
fi
@@ -1896,7 +1896,7 @@ poudriere_update_ports() {
else
echo -n ">>> Reseting local changes on ports tree ${POUDRIERE_PORTS_NAME}... " | tee -a ${LOGFILE}
script -aq ${LOGFILE} git -C "/usr/local/poudriere/ports/${POUDRIERE_PORTS_NAME}" reset --hard >/dev/null 2>&1
- script -aq ${LOGFILE} git -C "/usr/local/poudriere/ports/${POUDRIERE_PORTS_NAME}" clean -fxd >/dev/null 2>&1
+ script -aq ${LOGFILE} git -C "/usr/local/poudriere/ports/${POUDRIERE_PORTS_NAME}" clean -fd >/dev/null 2>&1
echo "Done!" | tee -a ${LOGFILE}
echo -n ">>> Updating ports tree ${POUDRIERE_PORTS_NAME}... " | tee -a ${LOGFILE}
script -aq ${LOGFILE} poudriere ports -u -p "${POUDRIERE_PORTS_NAME}" >/dev/null 2>&1
OpenPOWER on IntegriCloud