# HG changeset patch
# User Rob Landley <rob@landley.net>
# Date 1273118225 18000
# Node ID d4b0e9d731fc00aa8d251fcd8587ae177a65c07f
# Parent  21ec839a416f8bc67f3f8c6a381ea4bb807550a1
Minor cleanup, collate the === announce lines.

diff -r 21ec839a416f -r d4b0e9d731fc sources/functions.sh
--- a/sources/functions.sh	Wed May 05 22:28:47 2010 -0500
+++ b/sources/functions.sh	Wed May 05 22:57:05 2010 -0500
@@ -415,6 +415,9 @@
   PACKAGE="$1"
   unstable "$PACKAGE" && PACKAGE=alt-"$PACKAGE"
 
+  echo "=== Building $PACKAGE ($ARCH_NAME $STAGE_NAME)"
+  set_titlebar "$ARCH_NAME $STAGE_NAME $PACKAGE Building"
+
   # Make sure the source is already extracted and up-to-date.
   cd "${SRCDIR}" &&
   extract_package "${PACKAGE}-"*.tar* || exit 1
@@ -433,9 +436,6 @@
 
   [ -z "$SNAPSHOT_SYMLINK" ] && LINKTYPE="l" || LINKTYPE="s"
 
-  # Announce package, with easy-to-grep-for "===" marker.
-
-  echo "=== Building $PACKAGE ($ARCH_NAME $STAGE_NAME)"
   echo "Snapshot '$PACKAGE'..."
   cd "${WORK}" || dienow
   if [ $# -lt 3 ]
@@ -457,9 +457,6 @@
   fi
   export WRAPPY_LOGPATH="$BUILD/logs/cmdlines.${ARCH_NAME}.${STAGE_NAME}.$1"
 
-  # Change window title bar to package now
-  set_titlebar "$ARCH_NAME $STAGE_NAME $PACKAGE"
-
   # Ugly bug workaround: timestamp granularity in a lot of filesystems is only
   # 1 second, so find -newer misses things installed in the same second, so we
   # make sure it's a new second before we start actually doing anything.
diff -r 21ec839a416f -r d4b0e9d731fc system-image.sh
--- a/system-image.sh	Wed May 05 22:28:47 2010 -0500
+++ b/system-image.sh	Wed May 05 22:57:05 2010 -0500
@@ -204,4 +204,4 @@
 
 ARCH="$ARCH_NAME" create_stage_tarball
 
-echo -e "=== Packaging complete\e[0m"
+echo "=== Packaging complete"