Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 219294 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/sbin/emerge-webrsync.old (-6 / +10 lines)
Lines 91-97 Link Here
91
91
92
get_utc_second_from_string() {
92
get_utc_second_from_string() {
93
	local s="$1"
93
	local s="$1"
94
	date -d "${s:0:4}-${s:4:2}-${s:6:2}" -u +"%s"
94
	if	[[ ${USERLAND} == BSD ]] ; then
95
		date -juf "%Y%m%d" "$s" +"%s"
96
	else
97
		date -d "${s:0:4}-${s:4:2}-${s:6:2}" -u +"%s"
98
	fi
95
}
99
}
96
100
97
get_portage_timestamp() {
101
get_portage_timestamp() {
Lines 133-139 Link Here
133
	if type -P md5sum > /dev/null; then
137
	if type -P md5sum > /dev/null; then
134
		md5sum -c $digest && r=0
138
		md5sum -c $digest && r=0
135
	elif type -P md5 > /dev/null; then
139
	elif type -P md5 > /dev/null; then
136
		[ "$(md5 -q $file)" == "$(cut -d \ -f 1 \"$digest\")" ] && r=0
140
		[ $(md5 -q $file) == $(cut -d ' ' -f 1 $digest) ] && r=0
137
	else
141
	else
138
		eecho "cannot check digest: no suitable md5/md5sum binaries found"
142
		eecho "cannot check digest: no suitable md5/md5sum binaries found"
139
	fi
143
	fi
Lines 239-246 Link Here
239
			local signature="${file}.gpgsig"
243
			local signature="${file}.gpgsig"
240
244
241
			if [ -s "${file}" -a -s "${digest}" -a -s "${signature}" ] ; then
245
			if [ -s "${file}" -a -s "${digest}" -a -s "${signature}" ] ; then
242
				check_file_digest "${digest}" "${file}" && \
246
				check_file_digest "${DISTDIR}/${digest}" "${DISTDIR}/${file}" && \
243
				check_file_signature "${signature}" "${file}" && \
247
				check_file_signature "${DISTDIR}/${signature}" "${DISTDIR}/${file}" && \
244
				have_files=1
248
				have_files=1
245
			fi
249
			fi
246
250
Lines 248-255 Link Here
248
				fetch_file "${mirror}/snapshots/${digest}" "${digest}" && \
252
				fetch_file "${mirror}/snapshots/${digest}" "${digest}" && \
249
				fetch_file "${mirror}/snapshots/${signature}" "${signature}" && \
253
				fetch_file "${mirror}/snapshots/${signature}" "${signature}" && \
250
				fetch_file "${mirror}/snapshots/${file}" "${file}" && \
254
				fetch_file "${mirror}/snapshots/${file}" "${file}" && \
251
				check_file_digest "${digest}" "${file}" && \
255
				check_file_digest "${DISTDIR}/${digest}" "${DISTDIR}/${file}" && \
252
				check_file_signature "${signature}" "${file}" && \
256
				check_file_signature "${DISTDIR}/${signature}" "${DISTDIR}/${file}" && \
253
				have_files=1
257
				have_files=1
254
			fi
258
			fi
255
259

Return to bug 219294