Misc. fixes to versioning.

src/scripts/archive_build.sh

 #!/bin/bash
 
 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to archive build results.  Used by the buildbots.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
@@ skipping 32 matching lines @@
 # Get version information
 . "${SCRIPTS_DIR}/chromeos_version.sh"
 
 # Get git hash
 # Use git:8 chars of sha1
 REVISION=$(git rev-parse HEAD)
 REVISION=${REVISION:0:8}
 
 # Use the version number plus revision as the last change.  (Need both, since
 # trunk builds multiple times with the same version string.)
-LAST_CHANGE="${CHROMEOS_VERSION_STRING}-r${REVISION}-b${FLAGS_build_number}"
+LAST_CHANGE="${CHROMEOS_VERSION_STRING}-r${REVISION}"
+if [ -n "$FLAGS_build_number" ]
+then
+   LAST_CHANGE="$LAST_CHANGE-b${FLAGS_build_number}"
+fi
 
 # The Chromium buildbot scripts only create a clickable link to the archive
 # if an output line of the form "last change: XXX" exists
 echo "last change: $LAST_CHANGE"
 echo "archive from: $FLAGS_from"
 
 # Create the output directory
 OUTDIR="${FLAGS_to}/${LAST_CHANGE}"
 ZIPFILE="${OUTDIR}/${FLAGS_zipname}"
 echo "archive to dir: $OUTDIR"
@@ skipping 19 matching lines @@
 if [ $FLAGS_keep_max -gt 0 ]
 then
   echo "Deleting old builds (all but the newest ${FLAGS_keep_max})..."
   cd "$FLAGS_to"
   # +2 because line numbers start at 1 and need to skip LATEST file
   rm -rf `ls -t1 | tail --lines=+$(($FLAGS_keep_max + 2))`
   cd -
 fi
 
 echo "Done."