diff options
| author | unknown <lenz@mysql.com> | 2003-12-16 14:43:34 +0100 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2003-12-16 14:43:34 +0100 |
| commit | 2d8e40ef8e04ba3c07564a1714e7e0bf6aff3259 (patch) | |
| tree | 0a4268a082644283e97a26b2d142cca177ed356c | |
| parent | 35272547cbf9a446f9d52b8f4b4b42d2dc68000a (diff) | |
| download | mariadb-git-2d8e40ef8e04ba3c07564a1714e7e0bf6aff3259.tar.gz | |
- 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
| -rwxr-xr-x | Build-tools/Bootstrap | 2 | ||||
| -rwxr-xr-x | Build-tools/Do-rpm | 4 | ||||
| -rw-r--r-- | Build-tools/logger.pm | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/Build-tools/Bootstrap b/Build-tools/Bootstrap index 7d3ac1322f4..930d053b113 100755 --- a/Build-tools/Bootstrap +++ b/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"); diff --git a/Build-tools/Do-rpm b/Build-tools/Do-rpm index cedd55d1405..a216a3ba5dc 100755 --- a/Build-tools/Do-rpm +++ b/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!"); diff --git a/Build-tools/logger.pm b/Build-tools/logger.pm index becde95df18..835d8014aa0 100644 --- a/Build-tools/logger.pm +++ b/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; |