Merge pull request firehol#342 from ktsaou/master

update-ipsets: detect the need to reprocess an ipset
tgunr · May 15, 2018 · 58e1ff1 · 58e1ff1
2 parents bf41283 + 9759730
commit 58e1ff1
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/sbin/update-ipsets b/sbin/update-ipsets
@@ -2878,7 +2878,12 @@ update() {
 		# download it
 		download_manager "${ipset}" "${mins}" "${url}"
 		ret=$?
-		if [ $ret -eq ${DOWNLOAD_FAILED} ]
+
+		if [ \( -z "${IPSET_FILE[${ipset}]}" -o ! -f "${BASE_DIR}/${dst}" \) -a -s  "${BASE_DIR}/${src}" ]
+			then
+			ipset_silent "${ipset}" "forced reprocessing (ignoring download status)"
+
+		elif [ $ret -eq ${DOWNLOAD_FAILED} ]
 			then
 			ipset_silent "${ipset}" "download manager reports failure"
 			check_file_too_old "${ipset}" "${BASE_DIR}/${dst}"