Unverified Commit 81377cc9 authored by Eli Schwartz's avatar Eli Schwartz Committed by Mattia Rizzolo
Browse files

move "UTC" printing directly into format string now that date is used 



Signed-off-by: Mattia Rizzolo's avatarMattia Rizzolo <mattia@debian.org>
parent 84322d42

bin/reproducible_build_rpm.sh

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ update_mock() { 
		echo "$(date -u ) - yum updated."

		touch $STAMP

	else

		echo "$(date -u ) - mock and yum not updated, last update was at $(date -u --date=@$(stat -c %Y $STAMP) +'%F %T') UTC."

		echo "$(date -u ) - mock and yum not updated, last update was at $(date -u --date=@$(stat -c %Y $STAMP) +'%F %T %Z')"

	fi

	rm $DUMMY > /dev/null

}

bin/reproducible_html_archlinux.sh

+3 −5
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ create_pkg_state_and_html() { 


	if [ -z "$(cd $ARCHLINUX_PKG_PATH ; ls)" ] ; then

		# directory exists but is empty: package is building…

		echo "$(date -u )   - ignoring $PKG from '$REPOSITORY' which is building in $ARCHLINUX_PKG_PATH since $(date -u --date=@$(stat -c %Y $ARCHLINUX_PKG_PATH) +'%F %R') UTC"

		echo "$(date -u )   - ignoring $PKG from '$REPOSITORY' which is building in $ARCHLINUX_PKG_PATH since $(date -u --date=@$(stat -c %Y $ARCHLINUX_PKG_PATH) +'%F %R %Z')"

		return

	fi
@@ -73,6 +73,7 @@ create_pkg_state_and_html() { 
		# this horrible if elif elif elif elif...  monster is needed because

		# https://lists.archlinux.org/pipermail/pacman-dev/2017-September/022156.html

	        # has not yet been merged yet...



		if $blacklisted ; then

				echo BLACKLISTED > $ARCHLINUX_PKG_PATH/pkg.state

				echo "       <img src=\"/userContent/static/error.png\" alt=\"blacklisted icon\" /> blacklisted" >> $HTML_BUFFER
@@ -172,10 +173,7 @@ create_pkg_state_and_html() { 
		esac

	fi

	echo "      </td>" >> $HTML_BUFFER

	local BUILD_DATE="$(date -u --date=@$(stat -c %Y $ARCHLINUX_PKG_PATH/build1.log) +'%F %R')"

	if [ ! -z "$BUILD_DATE" ] ; then

		BUILD_DATE="$BUILD_DATE UTC"

	fi

	local BUILD_DATE="$(date -u --date=@$(stat -c %Y $ARCHLINUX_PKG_PATH/build1.log) +'%F %R %Z')"

	echo "      <td>$BUILD_DATE" >> $HTML_BUFFER

	local DURATION=$(cat $ARCHLINUX_PKG_PATH/pkg.build_duration 2>/dev/null || true)

	if [ -n "$DURATION" ]; then