| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-03 04:17:57 +0000 (Sat, 03 May 2008) |
| 3 |
New Revision: 10128 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge-webrsync |
| 7 |
Log: |
| 8 |
Bug #219294 - Fix 'date' and 'cut' arguments for BSD userland. Thanks to |
| 9 |
RB <aoz.syn@×××××.com> for this patch. (trunk r10126) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge-webrsync |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge-webrsync 2008-05-03 04:16:44 UTC (rev 10127) |
| 15 |
+++ main/branches/2.1.2/bin/emerge-webrsync 2008-05-03 04:17:57 UTC (rev 10128) |
| 16 |
@@ -91,7 +91,11 @@ |
| 17 |
|
| 18 |
get_utc_second_from_string() { |
| 19 |
local s="$1" |
| 20 |
- date -d "${s:0:4}-${s:4:2}-${s:6:2}" -u +"%s" |
| 21 |
+ if [[ ${USERLAND} == BSD ]] ; then |
| 22 |
+ date -juf "%Y%m%d" "$s" +"%s" |
| 23 |
+ else |
| 24 |
+ date -d "${s:0:4}-${s:4:2}-${s:6:2}" -u +"%s" |
| 25 |
+ fi |
| 26 |
} |
| 27 |
|
| 28 |
get_portage_timestamp() { |
| 29 |
@@ -133,7 +137,7 @@ |
| 30 |
if type -P md5sum > /dev/null; then |
| 31 |
md5sum -c $digest && r=0 |
| 32 |
elif type -P md5 > /dev/null; then |
| 33 |
- [ "$(md5 -q $file)" == "$(cut -d \ -f 1 \"$digest\")" ] && r=0 |
| 34 |
+ [ "$(md5 -q "${file}")" == "$(cut -d ' ' -f 1 "${digest}")" ] && r=0 |
| 35 |
else |
| 36 |
eecho "cannot check digest: no suitable md5/md5sum binaries found" |
| 37 |
fi |
| 38 |
|
| 39 |
-- |
| 40 |
gentoo-commits@l.g.o mailing list |
Archives