Commit 2d8e40ef authored by unknown's avatar unknown

- 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:
   - Define the subject for the failure mail within the Build script
Build-tools/Do-rpm:
   - Define the subject of the failure email within the build script
   - Added missing space to make moving of the resulting packages working
Build-tools/logger.pm:
   - Define the subject for the failure mail within the calling script instead
     of here
parent 35272547
...@@ -99,6 +99,8 @@ if (defined $opt_build_command) ...@@ -99,6 +99,8 @@ if (defined $opt_build_command)
print_help("") if ($opt_help); print_help("") if ($opt_help);
defined($REPO=$ARGV[0]) || print_help("Please enter the BK repository to be used!"); 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"); &logger("Starting build");
&abort("The directory \"$REPO\" could not be found!") if (!-d $REPO); &abort("The directory \"$REPO\" could not be found!") if (!-d $REPO);
&logger("Using $REPO as the BK parent repository"); &logger("Using $REPO as the BK parent repository");
......
...@@ -67,6 +67,8 @@ else ...@@ -67,6 +67,8 @@ else
die "ERROR: $LOGGER cannot be found!\n"; 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 the spec file and extract the version number
open(SPEC, $SPECFILE) or &abort("Unable to open \"$ARGV[0]\": $!"); open(SPEC, $SPECFILE) or &abort("Unable to open \"$ARGV[0]\": $!");
@spec= <SPEC>; @spec= <SPEC>;
...@@ -192,7 +194,7 @@ $command.= "$SRCRPMDIR/MySQL*$VERSION*.src.rpm $PWD"; ...@@ -192,7 +194,7 @@ $command.= "$SRCRPMDIR/MySQL*$VERSION*.src.rpm $PWD";
$command= "mv"; $command= "mv";
$command.= " -v " if ($opt_verbose); $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."); &logger("Moving binary RPMs to current dir.");
&run_command($command, "Error moving binary RPMs!"); &run_command($command, "Error moving binary RPMs!");
......
...@@ -53,7 +53,6 @@ sub abort ...@@ -53,7 +53,6 @@ sub abort
if ($opt_mail && !$opt_dry_run) if ($opt_mail && !$opt_dry_run)
{ {
$messagefile= "/tmp/message.$$"; $messagefile= "/tmp/message.$$";
$subject= "Bootstrap of $REPO failed";
open(TMP,">$messagefile"); open(TMP,">$messagefile");
print TMP "$message\n\n"; print TMP "$message\n\n";
close TMP; close TMP;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment