summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-01-30 22:31:18 +0000
committerZac Medico <zmedico@gentoo.org>2007-01-30 22:31:18 +0000
commitd6419a7081d617e596cc463114b777f90a739d5f (patch)
tree75b7dfd6112e1669fd1ba0c5cbac110af4bd366f
parent57857f8610d5d6ac2bf2068ecb7330662601587b (diff)
downloadportage-d6419a7081d617e596cc463114b777f90a739d5f.tar.gz
portage-d6419a7081d617e596cc463114b777f90a739d5f.tar.bz2
portage-d6419a7081d617e596cc463114b777f90a739d5f.zip
For bug #164532, don't rely on ${USERLAND} since the portage tree might be empty.
svn path=/main/trunk/; revision=5840
-rwxr-xr-xbin/emerge-webrsync6
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index be5f6d6d9..b1362b379 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -7,7 +7,7 @@
eval $(/usr/lib/portage/bin/portageq envvar -v FEATURES FETCHCOMMAND \
GENTOO_MIRRORS PORTAGE_INST_UID PORTAGE_INST_GID PORTAGE_NICENESS \
- PORTAGE_TMPDIR PORTDIR USERLAND)
+ PORTAGE_TMPDIR PORTDIR)
DISTDIR="${PORTAGE_TMPDIR}/emerge-webrsync"
# If PORTAGE_NICENESS is overriden via the env then it will
@@ -94,7 +94,9 @@ while (( $attempts < 40 )) ; do
# snapshot (for attempts=1, subtract 1 day from the current UTC time).
daysbefore=$(expr $(date -u +"%s") - 86400 \* ${attempts})
DATE_ARGS="-d @${daysbefore}"
- [ "${USERLAND}" != "GNU" ] && DATE_ARGS="-r ${daysbefore}"
+ # ${USERLAND} is unreliable since the portage tree might be empty, so test
+ # success of the -r option to distinguish between gnu and bsd date.
+ date -r ${daysbefore} >&/dev/null && DATE_ARGS="-r ${daysbefore}"
day=$(date ${DATE_ARGS} -u +"%d")
month=$(date ${DATE_ARGS} -u +"%m")
year=$(date ${DATE_ARGS} -u +"%Y")