- Bugfix for Do-rpm (moving of the resulting packages did not work due to

   a missing space)
 - Define the subject of the failure mail reports within the calling script
   instead of logger.pm

Build-tools/Bootstrap

@@ -99,6 +99,8 @@ if (defined $opt_build_command)
 print_help("") if ($opt_help);
 defined($REPO=$ARGV[0]) || print_help("Please enter the BK repository to be used!");
 
+$subject= "Bootstrap of $REPO failed" if $opt_mail;
+
 &logger("Starting build");
 &abort("The directory \"$REPO\" could not be found!") if (!-d $REPO);
 &logger("Using $REPO as the BK parent repository");

Build-tools/Do-rpm

@@ -67,6 +67,8 @@ else
 	die "ERROR: $LOGGER cannot be found!\n";
 }
 
+$subject= "RPM build for $SPECFILE failed" if $opt_mail;
+
 # Open the spec file and extract the version number
 open(SPEC, $SPECFILE) or &abort("Unable to open \"$ARGV[0]\": $!");
 @spec= <SPEC>;
@@ -192,7 +194,7 @@ $command.= "$SRCRPMDIR/MySQL*$VERSION*.src.rpm $PWD";
 
 $command= "mv";
 $command.= " -v " if ($opt_verbose);
-$command.= "$RPMDIR/$RPMARCH/MySQL*$VERSION*.$RPMARCH.rpm $PWD";
+$command.= " $RPMDIR/$RPMARCH/MySQL*$VERSION*.$RPMARCH.rpm $PWD";
 &logger("Moving binary RPMs to current dir.");
 &run_command($command, "Error moving binary RPMs!");
 

Build-tools/logger.pm

@@ -53,7 +53,6 @@ sub abort
 	if ($opt_mail && !$opt_dry_run)
 	{
 		$messagefile= "/tmp/message.$$";
-		$subject= "Bootstrap of $REPO failed";
 		open(TMP,">$messagefile");
 		print TMP "$message\n\n";
 		close TMP;