Page MenuHomeFreeBSD
Files F174803601

D12598.id33771.diff
No OneTemporary
Actions

D12598.id33771.diff
View Options

Index: Mk/Scripts/do-fetch.sh
===================================================================
--- Mk/Scripts/do-fetch.sh
+++ Mk/Scripts/do-fetch.sh
@@ -108,7 +108,7 @@
;;
esac
sites_remaining=0
- sites="$(${SORTED_MASTER_SITES_CMD_TMP} ${dp_RANDOMIZE_SITES})"
+ sites="$(eval ${SORTED_MASTER_SITES_CMD_TMP} ${dp_RANDOMIZE_SITES})"
for site in ${sites}; do
sites_remaining=$((sites_remaining + 1))
done
@@ -136,6 +136,16 @@
if env -S "${dp_FETCH_ENV}" ${_fetch_cmd}; then
actual_size=$(stat -f %z "${file}")
if [ -n "${dp_DISABLE_SIZE}" ] || [ -z "${CKSIZE}" ] || [ "${actual_size}" -eq "${CKSIZE}" ]; then
+ if [ -n "${dp_DEVELOPER}" ]; then
+ if [ "${site}" = "${dp_MASTER_SITE_BACKUP}" -a ${sites_remaining} -eq 0 ]; then
+ ${dp_ECHO_MSG} "===> /!\\ Warning /!\\"
+ ${dp_ECHO_MSG}
+ ${dp_ECHO_MSG} " Fetched $file distfile from the backup MASTER_SITE."
+ ${dp_ECHO_MSG} " Please check availablity of primary MASTER_SITES"
+ ${dp_ECHO_MSG} " if this situation persist."
+ ${dp_ECHO_MSG}
+ fi
+ fi
continue 2
else
${dp_ECHO_MSG} "=> Fetched file size mismatch (expected ${CKSIZE}, actual ${actual_size})"
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -2056,8 +2056,12 @@
FETCH_CMD?= ${FETCH_BINARY} ${FETCH_ARGS}
.if defined(RANDOMIZE_MASTER_SITES)
-.if exists(/usr/games/random)
+.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1100122)
RANDOM_CMD?= /usr/games/random
+.else
+RANDOM_CMD?= /usr/bin/random
+.endif
+.if exists(${RANDOM_CMD})
RANDOM_ARGS?= -w -f -
_RANDOMIZE_SITES= |${RANDOM_CMD} ${RANDOM_ARGS}
.endif

File Metadata

Mime Type
text/plain
Expires
Wed, Oct 7, 2:34 AM (14 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40331704
Default Alt Text
D12598.id33771.diff (1 KB)

Event Timeline