diff options
| author | unknown <monty@mysql.com> | 2003-12-19 16:42:17 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-12-19 16:42:17 +0200 |
| commit | 6988eaffade652053ab5154ace6a321e4d2ff9c6 (patch) | |
| tree | 1bc701f03b8b7eee26e53e61cad701ad3bbf621d /Build-tools | |
| parent | 245b1385a10a12a955c95338b08190cac5cfcbd4 (diff) | |
| parent | a7d8af9b08363808c2e2ec9e26ae67a5616bb746 (diff) | |
| download | mariadb-git-6988eaffade652053ab5154ace6a321e4d2ff9c6.tar.gz | |
merge with 4.0.18
Build-tools/Bootstrap:
Auto merged
client/mysql.cc:
Auto merged
mysql-test/r/auto_increment.result:
Auto merged
mysql-test/t/auto_increment.test:
Auto merged
mysql-test/t/type_decimal.test:
Auto merged
sql/opt_range.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/slave.cc:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
Diffstat (limited to 'Build-tools')
| -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; |